From 4e639ee2ff917665cda97e56efd6109c87944d8b Mon Sep 17 00:00:00 2001 From: Cristian Le Date: Fri, 30 Jul 2021 16:54:50 +0900 Subject: [PATCH] Mistakes and nullchecks Doesn't javascript support `a?.b?.c`? --- puppet/src/main.js | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/puppet/src/main.js b/puppet/src/main.js index 6e60017..b2d1a2d 100644 --- a/puppet/src/main.js +++ b/puppet/src/main.js @@ -17,7 +17,7 @@ import process from "process" import fs from "fs" import sd from "systemd-daemon" import logger from "loglevel" -import loggerprefix from "loglevel" +import loggerprefix from "loglevel-plugin-prefix" import arg from "arg" @@ -44,13 +44,15 @@ MessagesPuppeteer.extensionDir = config.extension_dir || MessagesPuppeteer.exten MessagesPuppeteer.cycleDelay = config.cycle_delay || MessagesPuppeteer.cycleDelay MessagesPuppeteer.useXdotool = config.use_xdotool || MessagesPuppeteer.useXdotool MessagesPuppeteer.jiggleDelay = config.jiggle_delay || MessagesPuppeteer.jiggleDelay -logger.setLevel(config.logger.default_level || 3) -logger.getLogger("Puppeteer").setLevel(config.logger.puppeteer.level || logger.getLevel()) -logger.getLogger("Puppeteer_details").setLevel(config.logger.puppeteer.details || 3) -logger.getLogger("Puppeteer_spammer").setLevel(config.logger.puppeteer.spammer || 3) +let clog = config.logger +let clogpup = clog ? clog.puppeteer : undefined +logger.setLevel(clog ? clog.default_level || 3 : 3) +logger.getLogger("Puppeteer").setLevel(clogpup ? clogpup.level : logger.getLevel()) +logger.getLogger("Puppeteer_details").setLevel(clogpup ? clogpup.details : 3) +logger.getLogger("Puppeteer_spammer").setLevel(clogpup ? clogpup.spammer : 3) // Register and specify the logger format. Others will inherit loggerprefix.reg(logger) -loggerprefix.apply(logger, { template: '[%n] %l:' }); +loggerprefix.apply(logger, {template: '[%n] %l:'}); const api = new PuppetAPI(config.listen)