storage-node: File logging fixes.

storage-node-v2/src/commands/server.ts

@@ -143,8 +143,6 @@ Supported values: warn, error, debug, info. Default:debug`,
         process: this.config,
         queryNodeEndpoint: flags.queryNodeEndpoint,
         enableUploadingAuth: false,
-        elasticSearchEndpoint: flags.elasticSearchEndpoint,
-        logSource,
       })
       logger.info(`Listening on http://localhost:${port}`)
       app.listen(port)

storage-node-v2/src/services/logger.ts

@@ -83,41 +83,13 @@ export default proxy
 
 /**
  * Creates Express-Winston logger options.
- * @param logSource - source tag for log entries.
- * @param elasticSearchEndpoint - elastic search engine endpoint (optional).
- * @returns  Express-Winston logger options
  *
  */
-export function createExpressLoggerOptions(
-  elasticSearchEndpoint?: string,
-  filename?: string,
-logSource: string
-): expressWinston.LoggerOptions {
-  // ElasticSearch server date format.
-  const elasticDateFormat = 'YYYY-MM-DDTHH:mm:ss'
-
-  const transports: winston.transport[] = [
-    new winston.transports.Console({
-      format: winston.format.combine(winston.format.timestamp({ format: elasticDateFormat }), winston.format.json()),
-    }),
-  ]
-
-  if (elasticSearchEndpoint) {
-    transports.push(createElasticTransport(elasticSearchEndpoint, logSource))
-  }
-  if (filename) {
-    transports.push(createFileTransport(filename))
-  }
-
-  const opts: expressWinston.LoggerOptions = {
-    transports,
-    meta: true,
-    msg: 'HTTP {{req.method}} {{req.url}}',
-    expressFormat: true,
-    colorize: false,
+export function createExpressLoggerOptions(): expressWinston.LoggerOptions {
+  return {
+    winstonInstance: proxy,
+    level: 'http',
   }
-
-  return opts
 }
 
 /**
@@ -149,7 +121,11 @@ export function httpLogger(options: expressWinston.LoggerOptions): Handler {
  * @returns Winston logger
  *
  */
-function createCustomLogger(customOptions: { logSource: string, elasticSearchEndpoint?: string; filename?: string }): winston.Logger {
+function createCustomLogger(customOptions: {
+  logSource: string
+  elasticSearchEndpoint?: string
+  filename?: string
+}): winston.Logger {
   const loggerOptions = createDefaultLoggerOptions()
 
   // Transports
@@ -159,7 +135,7 @@ function createCustomLogger(customOptions: { logSource: string, elasticSearchEnd
   }
 
   if (customOptions.elasticSearchEndpoint) {
-    transports.push(createElasticTransport(logSource, customOptions.elasticSearchEndpoint))
+    transports.push(createElasticTransport(customOptions.logSource, customOptions.elasticSearchEndpoint))
   }
   if (customOptions.filename) {
     transports.push(createFileTransport(customOptions.filename))
@@ -185,7 +161,7 @@ function createCustomLogger(customOptions: { logSource: string, elasticSearchEnd
  * @param elasticSearchEndpoint - elastic search engine endpoint.
  * @param filename - absolute path to the log file.
  */
-export function initNewLogger(options: { logSource: string,elasticSearchEndpoint?: string; filename?: string }): void {
+export function initNewLogger(options: { logSource: string; elasticSearchEndpoint?: string; filename?: string }): void {
   InnerLogger = createCustomLogger(options)
 }
 

storage-node-v2/src/services/webApi/app.ts

@@ -20,7 +20,7 @@ import { createExpressLoggerOptions, httpLogger, errorLogger } from '../../servi
 export async function createApp(config: AppConfig): Promise<Express> {
   const spec = path.join(__dirname, './../../api-spec/openapi.yaml')
   const app = express()
-  const expressLoggerOptions = createExpressLoggerOptions(config.elasticSearchEndpoint, config.logSource)
+  const expressLoggerOptions = createExpressLoggerOptions()
 
   app.use(cors())
   app.use(express.json())

storage-node-v2/src/services/webApi/controllers/common.ts

@@ -132,16 +132,6 @@ export type AppConfig = {
    */
   enableUploadingAuth: boolean
 
-  /**
-   * Source tag for log entries for ElasticSearch.
-   */
-  logSource: string
-
-  /**
-   * ElasticSearch logging endpoint URL
-   */
-  elasticSearchEndpoint?: string
-
   /**
    * Max file size for uploading limit.
    */