X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fhelpers%2Flogger.ts;h=20c3c3edbaa111bb5ef304a98ae7781fb5648ebd;hb=fbd67e7f386504e50f2504cb6386700a58906f16;hp=a112fd30006b1d2f7706c5946d386261d6b23b61;hpb=dc48fdbe68e9dd3a3a6028181e61d8595d98e654;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/helpers/logger.ts b/server/helpers/logger.ts index a112fd300..20c3c3edb 100644 --- a/server/helpers/logger.ts +++ b/server/helpers/logger.ts @@ -1,5 +1,5 @@ // Thanks http://tostring.it/2014/06/23/advanced-logging-with-nodejs/ -import { mkdirpSync } from 'fs-extra' +import { mkdirpSync, stat } from 'fs-extra' import { omit } from 'lodash' import * as path from 'path' import { format as sqlFormat } from 'sql-formatter' @@ -151,20 +151,44 @@ const bunyanLogger = { fatal: bunyanLogFactory('error') } -function loggerTagsFactory (...defaultTags: string[]) { +type LoggerTagsFn = (...tags: string[]) => { tags: string[] } +function loggerTagsFactory (...defaultTags: string[]): LoggerTagsFn { return (...tags: string[]) => { return { tags: defaultTags.concat(tags) } } } +async function mtimeSortFilesDesc (files: string[], basePath: string) { + const promises = [] + const out: { file: string, mtime: number }[] = [] + + for (const file of files) { + const p = stat(basePath + '/' + file) + .then(stats => { + if (stats.isFile()) out.push({ file, mtime: stats.mtime.getTime() }) + }) + + promises.push(p) + } + + await Promise.all(promises) + + out.sort((a, b) => b.mtime - a.mtime) + + return out +} + // --------------------------------------------------------------------------- export { + LoggerTagsFn, + buildLogger, timestampFormatter, labelFormatter, consoleLoggerFormat, jsonLoggerFormat, + mtimeSortFilesDesc, logger, loggerTagsFactory, bunyanLogger