From 7f1249d0609a5cbda48137ca4c3f2ee98fd2545d Mon Sep 17 00:00:00 2001 From: soulgalore Date: Sat, 25 May 2024 16:38:35 +0200 Subject: [PATCH] unify logging --- test/config/dockertestrunner.yaml | 2 +- testrunner/config/default.yaml | 2 +- testrunner/src/sitespeedio-testrunner.js | 2 +- testrunner/src/validateconfig.js | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test/config/dockertestrunner.yaml b/test/config/dockertestrunner.yaml index 084c47e..db82ab0 100644 --- a/test/config/dockertestrunner.yaml +++ b/test/config/dockertestrunner.yaml @@ -17,7 +17,7 @@ redis: password: jgsay7f2fgfgda6acCa7g()jaba51! # Verbose log level or not -logging: +log: verbose: true # The default sitespeed.io configuration file used by the sitespeed.io instance diff --git a/testrunner/config/default.yaml b/testrunner/config/default.yaml index 9d386b1..11f61fa 100644 --- a/testrunner/config/default.yaml +++ b/testrunner/config/default.yaml @@ -32,7 +32,7 @@ redis: password: jgsay7f2fgfgda6acCa7g()jaba51! # Verbose log level or not -logging: +log: verbose: false # The default sitespeed.io configuration file used by the sitespeed.io instance diff --git a/testrunner/src/sitespeedio-testrunner.js b/testrunner/src/sitespeedio-testrunner.js index eb52af2..923f795 100644 --- a/testrunner/src/sitespeedio-testrunner.js +++ b/testrunner/src/sitespeedio-testrunner.js @@ -12,7 +12,7 @@ const queues = []; export class SitespeedioTestRunner { constructor() { - const logVerbose = nconf.get('logging:verbose'); + const logVerbose = nconf.get('log:verbose'); log.basicConfig({ format: '[%(date)s] %(levelname)s: [%(name)s] %(message)s', diff --git a/testrunner/src/validateconfig.js b/testrunner/src/validateconfig.js index 9e0ddb9..63da047 100644 --- a/testrunner/src/validateconfig.js +++ b/testrunner/src/validateconfig.js @@ -54,7 +54,7 @@ const dockerSchema = Joi.object({ const configSchema = Joi.object({ location: locationSchema.required(), redis: redisSchema.required(), - logging: loggingSchema.required(), + log: loggingSchema.required(), sitespeedioConfigFile: Joi.string().optional(), workingDirectory: Joi.string().optional(), executable: Joi.string().required(),