diff --git a/backend/app.js b/backend/app.js index 857db882..3039bbb8 100644 --- a/backend/app.js +++ b/backend/app.js @@ -5,7 +5,7 @@ import fileUpload from "express-fileupload"; import { isDebugMode } from "./lib/config.js"; import cors from "./lib/express/cors.js"; import jwt from "./lib/express/jwt.js"; -import { express as logger } from "./logger.js"; +import { debug, express as logger } from "./logger.js"; import mainRoutes from "./routes/main.js"; /** @@ -80,7 +80,7 @@ app.use((err, req, res, _) => { // Not every error is worth logging - but this is good for now until it gets annoying. if (typeof err.stack !== "undefined" && err.stack) { - logger.debug(err.stack); + debug(logger, err.stack); if (typeof err.public === "undefined" || !err.public) { logger.warn(err.message); } diff --git a/backend/internal/certificate.js b/backend/internal/certificate.js index ca02e2d9..1bb49ad8 100644 --- a/backend/internal/certificate.js +++ b/backend/internal/certificate.js @@ -10,7 +10,7 @@ import { installPlugin } from "../lib/certbot.js"; import { useLetsencryptServer, useLetsencryptStaging } from "../lib/config.js"; import error from "../lib/error.js"; import utils from "../lib/utils.js"; -import { ssl as logger } from "../logger.js"; +import { debug, ssl as logger } from "../logger.js"; import certificateModel from "../models/certificate.js"; import tokenModel from "../models/token.js"; import userModel from "../models/user.js"; @@ -355,7 +355,7 @@ const internalCertificate = { const opName = `/tmp/${downloadName}`; await internalCertificate.zipFiles(certFiles, opName); - logger.debug("zip completed : ", opName); + debug(logger, "zip completed : ", opName); return { fileName: opName, }; @@ -375,7 +375,7 @@ const internalCertificate = { return new Promise((resolve, reject) => { source.map((fl) => { const fileName = path.basename(fl); - logger.debug(fl, "added to certificate zip"); + debug(logger, fl, "added to certificate zip"); archive.file(fl, { name: fileName }); return true; }); diff --git a/backend/internal/nginx.js b/backend/internal/nginx.js index 573beeb1..83d2c3f0 100644 --- a/backend/internal/nginx.js +++ b/backend/internal/nginx.js @@ -4,7 +4,7 @@ import { fileURLToPath } from "node:url"; import _ from "lodash"; import errs from "../lib/error.js"; import utils from "../lib/utils.js"; -import { nginx as logger } from "../logger.js"; +import { debug, nginx as logger } from "../logger.js"; const __filename = fileURLToPath(import.meta.url); const __dirname = dirname(__filename); @@ -68,7 +68,7 @@ const internalNginx = { return true; }); - logger.debug("Nginx test failed:", valid_lines.join("\n")); + debug(logger, "Nginx test failed:", valid_lines.join("\n")); // config is bad, update meta and delete config combined_meta = _.assign({}, host.meta, { @@ -102,7 +102,7 @@ const internalNginx = { * @returns {Promise} */ test: () => { - logger.debug("Testing Nginx configuration"); + debug(logger, "Testing Nginx configuration"); return utils.execFile("/usr/sbin/nginx", ["-t", "-g", "error_log off;"]); }, @@ -190,7 +190,7 @@ const internalNginx = { const host = JSON.parse(JSON.stringify(host_row)); const nice_host_type = internalNginx.getFileFriendlyHostType(host_type); - logger.debug(`Generating ${nice_host_type} Config:`, JSON.stringify(host, null, 2)); + debug(logger, `Generating ${nice_host_type} Config:`, JSON.stringify(host, null, 2)); const renderEngine = utils.getRenderEngine(); @@ -241,7 +241,7 @@ const internalNginx = { .parseAndRender(template, host) .then((config_text) => { fs.writeFileSync(filename, config_text, { encoding: "utf8" }); - logger.debug("Wrote config:", filename, config_text); + debug(logger, "Wrote config:", filename, config_text); // Restore locations array host.locations = origLocations; @@ -249,7 +249,7 @@ const internalNginx = { resolve(true); }) .catch((err) => { - logger.debug(`Could not write ${filename}:`, err.message); + debug(logger, `Could not write ${filename}:`, err.message); reject(new errs.ConfigurationError(err.message)); }); }); @@ -265,7 +265,7 @@ const internalNginx = { * @returns {Promise} */ generateLetsEncryptRequestConfig: (certificate) => { - logger.debug("Generating LetsEncrypt Request Config:", certificate); + debug(logger, "Generating LetsEncrypt Request Config:", certificate); const renderEngine = utils.getRenderEngine(); return new Promise((resolve, reject) => { @@ -285,11 +285,11 @@ const internalNginx = { .parseAndRender(template, certificate) .then((config_text) => { fs.writeFileSync(filename, config_text, { encoding: "utf8" }); - logger.debug("Wrote config:", filename, config_text); + debug(logger, "Wrote config:", filename, config_text); resolve(true); }) .catch((err) => { - logger.debug(`Could not write ${filename}:`, err.message); + debug(logger, `Could not write ${filename}:`, err.message); reject(new errs.ConfigurationError(err.message)); }); }); @@ -305,10 +305,10 @@ const internalNginx = { return; } try { - logger.debug(`Deleting file: ${filename}`); + debug(logger, `Deleting file: ${filename}`); fs.unlinkSync(filename); } catch (err) { - logger.debug("Could not delete file:", JSON.stringify(err, null, 2)); + debug(logger, "Could not delete file:", JSON.stringify(err, null, 2)); } }, diff --git a/backend/lib/config.js b/backend/lib/config.js index a31ab0d4..0b80c748 100644 --- a/backend/lib/config.js +++ b/backend/lib/config.js @@ -96,7 +96,9 @@ const configure = () => { const getKeys = () => { // Get keys from file - logger.debug("Cheecking for keys file:", keysFile); + if (isDebugMode()) { + logger.debug("Checking for keys file:", keysFile); + } if (!fs.existsSync(keysFile)) { generateKeys(); } else if (process.env.DEBUG) { diff --git a/backend/lib/utils.js b/backend/lib/utils.js index 21904df2..af7ad3c9 100644 --- a/backend/lib/utils.js +++ b/backend/lib/utils.js @@ -3,14 +3,14 @@ import { dirname } from "node:path"; import { fileURLToPath } from "node:url"; import { Liquid } from "liquidjs"; import _ from "lodash"; -import { global as logger } from "../logger.js"; +import { debug, global as logger } from "../logger.js"; import errs from "./error.js"; const __filename = fileURLToPath(import.meta.url); const __dirname = dirname(__filename); const exec = async (cmd, options = {}) => { - logger.debug("CMD:", cmd); + debug(logger, "CMD:", cmd); const { stdout, stderr } = await new Promise((resolve, reject) => { const child = nodeExec(cmd, options, (isError, stdout, stderr) => { if (isError) { @@ -34,7 +34,7 @@ const exec = async (cmd, options = {}) => { * @returns {Promise} */ const execFile = (cmd, args, options) => { - logger.debug(`CMD: ${cmd} ${args ? args.join(" ") : ""}`); + debug(logger, `CMD: ${cmd} ${args ? args.join(" ") : ""}`); const opts = options || {}; return new Promise((resolve, reject) => { diff --git a/backend/logger.js b/backend/logger.js index 6318a5fb..7bf4ee05 100644 --- a/backend/logger.js +++ b/backend/logger.js @@ -1,4 +1,5 @@ import signale from "signale"; +import { isDebugMode } from "./lib/config.js"; const opts = { logLevel: "info", @@ -15,4 +16,10 @@ const importer = new signale.Signale({ scope: "Importer ", ...opts }); const setup = new signale.Signale({ scope: "Setup ", ...opts }); const ipRanges = new signale.Signale({ scope: "IP Ranges", ...opts }); -export { global, migrate, express, access, nginx, ssl, certbot, importer, setup, ipRanges }; +const debug = (logger, ...args) => { + if (isDebugMode()) { + logger.debug(...args); + } +}; + +export { debug, global, migrate, express, access, nginx, ssl, certbot, importer, setup, ipRanges }; diff --git a/backend/routes/audit-log.js b/backend/routes/audit-log.js index 7cd232df..c40b1628 100644 --- a/backend/routes/audit-log.js +++ b/backend/routes/audit-log.js @@ -2,7 +2,7 @@ import express from "express"; import internalAuditLog from "../internal/audit-log.js"; import jwtdecode from "../lib/express/jwt-decode.js"; import validator from "../lib/validator/index.js"; -import { express as logger } from "../logger.js"; +import { debug, express as logger } from "../logger.js"; const router = express.Router({ caseSensitive: true, @@ -47,7 +47,7 @@ router const rows = await internalAuditLog.getAll(res.locals.access, data.expand, data.query); res.status(200).send(rows); } catch (err) { - logger.debug(`${req.method.toUpperCase()} ${req.path}: ${err}`); + debug(logger, `${req.method.toUpperCase()} ${req.path}: ${err}`); next(err); } }); @@ -99,7 +99,7 @@ router }); res.status(200).send(item); } catch (err) { - logger.debug(`${req.method.toUpperCase()} ${req.path}: ${err}`); + debug(logger, `${req.method.toUpperCase()} ${req.path}: ${err}`); next(err); } }); diff --git a/backend/routes/nginx/access_lists.js b/backend/routes/nginx/access_lists.js index a1c75f82..9dfcf7ec 100644 --- a/backend/routes/nginx/access_lists.js +++ b/backend/routes/nginx/access_lists.js @@ -3,7 +3,7 @@ import internalAccessList from "../../internal/access-list.js"; import jwtdecode from "../../lib/express/jwt-decode.js"; import apiValidator from "../../lib/validator/api.js"; import validator from "../../lib/validator/index.js"; -import { express as logger } from "../../logger.js"; +import { debug, express as logger } from "../../logger.js"; import { getValidationSchema } from "../../schema/index.js"; const router = express.Router({ @@ -49,7 +49,7 @@ router const rows = await internalAccessList.getAll(res.locals.access, data.expand, data.query); res.status(200).send(rows); } catch (err) { - logger.debug(`${req.method.toUpperCase()} ${req.path}: ${err}`); + debug(logger, `${req.method.toUpperCase()} ${req.path}: ${err}`); next(err); } }) @@ -65,7 +65,7 @@ router const result = await internalAccessList.create(res.locals.access, payload); res.status(201).send(result); } catch (err) { - logger.debug(`${req.method.toUpperCase()} ${req.path}: ${err}`); + debug(logger, `${req.method.toUpperCase()} ${req.path}: ${err}`); next(err); } }); @@ -113,7 +113,7 @@ router }); res.status(200).send(row); } catch (err) { - logger.debug(`${req.method.toUpperCase()} ${req.path}: ${err}`); + debug(logger, `${req.method.toUpperCase()} ${req.path}: ${err}`); next(err); } }) @@ -130,7 +130,7 @@ router const result = await internalAccessList.update(res.locals.access, payload); res.status(200).send(result); } catch (err) { - logger.debug(`${req.method.toUpperCase()} ${req.path}: ${err}`); + debug(logger, `${req.method.toUpperCase()} ${req.path}: ${err}`); next(err); } }) @@ -147,7 +147,7 @@ router }); res.status(200).send(result); } catch (err) { - logger.debug(`${req.method.toUpperCase()} ${req.path}: ${err}`); + debug(logger, `${req.method.toUpperCase()} ${req.path}: ${err}`); next(err); } }); diff --git a/backend/routes/nginx/certificates.js b/backend/routes/nginx/certificates.js index 0a2c4b1b..99f429b4 100644 --- a/backend/routes/nginx/certificates.js +++ b/backend/routes/nginx/certificates.js @@ -5,7 +5,7 @@ import errs from "../../lib/error.js"; import jwtdecode from "../../lib/express/jwt-decode.js"; import apiValidator from "../../lib/validator/api.js"; import validator from "../../lib/validator/index.js"; -import { express as logger } from "../../logger.js"; +import { debug, express as logger } from "../../logger.js"; import { getValidationSchema } from "../../schema/index.js"; const router = express.Router({ @@ -58,7 +58,7 @@ router ); res.status(200).send(rows); } catch (err) { - logger.debug(`${req.method.toUpperCase()} ${req.path}: ${err}`); + debug(logger, `${req.method.toUpperCase()} ${req.path}: ${err}`); next(err); } }) @@ -81,7 +81,7 @@ router ); res.status(201).send(result); } catch (err) { - logger.debug(`${req.method.toUpperCase()} ${req.path}: ${err}`); + debug(logger, `${req.method.toUpperCase()} ${req.path}: ${err}`); next(err); } }); @@ -115,7 +115,7 @@ router clean.sort((a, b) => a.name.localeCompare(b.name)); res.status(200).send(clean); } catch (err) { - logger.debug(`${req.method.toUpperCase()} ${req.path}: ${err}`); + debug(logger, `${req.method.toUpperCase()} ${req.path}: ${err}`); next(err); } }); @@ -151,7 +151,7 @@ router ); res.status(200).send(result); } catch (err) { - logger.debug(`${req.method.toUpperCase()} ${req.path}: ${err}`); + debug(logger, `${req.method.toUpperCase()} ${req.path}: ${err}`); next(err); } }); @@ -185,7 +185,7 @@ router }); res.status(200).send(result); } catch (err) { - logger.debug(`${req.method.toUpperCase()} ${req.path}: ${err}`); + debug(logger, `${req.method.toUpperCase()} ${req.path}: ${err}`); next(err); } }); @@ -236,7 +236,7 @@ router }); res.status(200).send(row); } catch (err) { - logger.debug(`${req.method.toUpperCase()} ${req.path}: ${err}`); + debug(logger, `${req.method.toUpperCase()} ${req.path}: ${err}`); next(err); } }) @@ -253,7 +253,7 @@ router }); res.status(200).send(result); } catch (err) { - logger.debug(`${req.method.toUpperCase()} ${req.path}: ${err}`); + debug(logger, `${req.method.toUpperCase()} ${req.path}: ${err}`); next(err); } }); @@ -288,7 +288,7 @@ router }); res.status(200).send(result); } catch (err) { - logger.debug(`${req.method.toUpperCase()} ${req.path}: ${err}`); + debug(logger, `${req.method.toUpperCase()} ${req.path}: ${err}`); next(err); } }); @@ -318,7 +318,7 @@ router }); res.status(200).send(result); } catch (err) { - logger.debug(`${req.method.toUpperCase()} ${req.path}: ${err}`); + debug(logger, `${req.method.toUpperCase()} ${req.path}: ${err}`); next(err); } }); @@ -347,7 +347,7 @@ router }); res.status(200).download(result.fileName); } catch (err) { - logger.debug(`${req.method.toUpperCase()} ${req.path}: ${err}`); + debug(logger, `${req.method.toUpperCase()} ${req.path}: ${err}`); next(err); } }); diff --git a/backend/routes/nginx/dead_hosts.js b/backend/routes/nginx/dead_hosts.js index 5323c731..31f70436 100644 --- a/backend/routes/nginx/dead_hosts.js +++ b/backend/routes/nginx/dead_hosts.js @@ -3,7 +3,7 @@ import internalDeadHost from "../../internal/dead-host.js"; import jwtdecode from "../../lib/express/jwt-decode.js"; import apiValidator from "../../lib/validator/api.js"; import validator from "../../lib/validator/index.js"; -import { express as logger } from "../../logger.js"; +import { debug, express as logger } from "../../logger.js"; import { getValidationSchema } from "../../schema/index.js"; const router = express.Router({ @@ -49,7 +49,7 @@ router const rows = await internalDeadHost.getAll(res.locals.access, data.expand, data.query); res.status(200).send(rows); } catch (err) { - logger.debug(`${req.method.toUpperCase()} ${req.path}: ${err}`); + debug(logger, `${req.method.toUpperCase()} ${req.path}: ${err}`); next(err); } }) @@ -65,7 +65,7 @@ router const result = await internalDeadHost.create(res.locals.access, payload); res.status(201).send(result); } catch (err) { - logger.debug(`${req.method.toUpperCase()} ${req.path}: ${err}`); + debug(logger, `${req.method.toUpperCase()} ${req.path}: ${err}`); next(err); } }); @@ -113,7 +113,7 @@ router }); res.status(200).send(row); } catch (err) { - logger.debug(`${req.method.toUpperCase()} ${req.path}: ${err}`); + debug(logger, `${req.method.toUpperCase()} ${req.path}: ${err}`); next(err); } }) @@ -130,7 +130,7 @@ router const result = await internalDeadHost.update(res.locals.access, payload); res.status(200).send(result); } catch (err) { - logger.debug(`${req.method.toUpperCase()} ${req.path}: ${err}`); + debug(logger, `${req.method.toUpperCase()} ${req.path}: ${err}`); next(err); } }) @@ -147,7 +147,7 @@ router }); res.status(200).send(result); } catch (err) { - logger.debug(`${req.method.toUpperCase()} ${req.path}: ${err}`); + debug(logger, `${req.method.toUpperCase()} ${req.path}: ${err}`); next(err); } }); @@ -174,7 +174,7 @@ router }); res.status(200).send(result); } catch (err) { - logger.debug(`${req.method.toUpperCase()} ${req.path}: ${err}`); + debug(logger, `${req.method.toUpperCase()} ${req.path}: ${err}`); next(err); } }); @@ -199,7 +199,7 @@ router const result = internalDeadHost.disable(res.locals.access, { id: Number.parseInt(req.params.host_id, 10) }); res.status(200).send(result); } catch (err) { - logger.debug(`${req.method.toUpperCase()} ${req.path}: ${err}`); + debug(logger, `${req.method.toUpperCase()} ${req.path}: ${err}`); next(err); } }); diff --git a/backend/routes/nginx/proxy_hosts.js b/backend/routes/nginx/proxy_hosts.js index 5b2a4178..7045a195 100644 --- a/backend/routes/nginx/proxy_hosts.js +++ b/backend/routes/nginx/proxy_hosts.js @@ -3,7 +3,7 @@ import internalProxyHost from "../../internal/proxy-host.js"; import jwtdecode from "../../lib/express/jwt-decode.js"; import apiValidator from "../../lib/validator/api.js"; import validator from "../../lib/validator/index.js"; -import { express as logger } from "../../logger.js"; +import { debug, express as logger } from "../../logger.js"; import { getValidationSchema } from "../../schema/index.js"; const router = express.Router({ @@ -49,7 +49,7 @@ router const rows = await internalProxyHost.getAll(res.locals.access, data.expand, data.query); res.status(200).send(rows); } catch (err) { - logger.debug(`${req.method.toUpperCase()} ${req.path}: ${err}`); + debug(logger, `${req.method.toUpperCase()} ${req.path}: ${err}`); next(err); } }) @@ -65,7 +65,7 @@ router const result = await internalProxyHost.create(res.locals.access, payload); res.status(201).send(result); } catch (err) { - logger.debug(`${req.method.toUpperCase()} ${req.path}: ${err} ${JSON.stringify(err.debug, null, 2)}`); + debug(logger, `${req.method.toUpperCase()} ${req.path}: ${err} ${JSON.stringify(err.debug, null, 2)}`); next(err); } }); @@ -113,7 +113,7 @@ router }); res.status(200).send(row); } catch (err) { - logger.debug(`${req.method.toUpperCase()} ${req.path}: ${err}`); + debug(logger, `${req.method.toUpperCase()} ${req.path}: ${err}`); next(err); } }) @@ -130,7 +130,7 @@ router const result = await internalProxyHost.update(res.locals.access, payload); res.status(200).send(result); } catch (err) { - logger.debug(`${req.method.toUpperCase()} ${req.path}: ${err}`); + debug(logger, `${req.method.toUpperCase()} ${req.path}: ${err}`); next(err); } }) @@ -147,7 +147,7 @@ router }); res.status(200).send(result); } catch (err) { - logger.debug(`${req.method.toUpperCase()} ${req.path}: ${err}`); + debug(logger, `${req.method.toUpperCase()} ${req.path}: ${err}`); next(err); } }); @@ -174,7 +174,7 @@ router }); res.status(200).send(result); } catch (err) { - logger.debug(`${req.method.toUpperCase()} ${req.path}: ${err}`); + debug(logger, `${req.method.toUpperCase()} ${req.path}: ${err}`); next(err); } }); @@ -201,7 +201,7 @@ router }); res.status(200).send(result); } catch (err) { - logger.debug(`${req.method.toUpperCase()} ${req.path}: ${err}`); + debug(logger, `${req.method.toUpperCase()} ${req.path}: ${err}`); next(err); } }); diff --git a/backend/routes/nginx/redirection_hosts.js b/backend/routes/nginx/redirection_hosts.js index bbeccf6e..9b5b5b37 100644 --- a/backend/routes/nginx/redirection_hosts.js +++ b/backend/routes/nginx/redirection_hosts.js @@ -3,7 +3,7 @@ import internalRedirectionHost from "../../internal/redirection-host.js"; import jwtdecode from "../../lib/express/jwt-decode.js"; import apiValidator from "../../lib/validator/api.js"; import validator from "../../lib/validator/index.js"; -import { express as logger } from "../../logger.js"; +import { debug, express as logger } from "../../logger.js"; import { getValidationSchema } from "../../schema/index.js"; const router = express.Router({ @@ -49,7 +49,7 @@ router const rows = await internalRedirectionHost.getAll(res.locals.access, data.expand, data.query); res.status(200).send(rows); } catch (err) { - logger.debug(`${req.method.toUpperCase()} ${req.path}: ${err}`); + debug(logger, `${req.method.toUpperCase()} ${req.path}: ${err}`); next(err); } }) @@ -65,7 +65,7 @@ router const result = await internalRedirectionHost.create(res.locals.access, payload); res.status(201).send(result); } catch (err) { - logger.debug(`${req.method.toUpperCase()} ${req.path}: ${err}`); + debug(logger, `${req.method.toUpperCase()} ${req.path}: ${err}`); next(err); } }); @@ -113,7 +113,7 @@ router }); res.status(200).send(row); } catch (err) { - logger.debug(`${req.method.toUpperCase()} ${req.path}: ${err}`); + debug(logger, `${req.method.toUpperCase()} ${req.path}: ${err}`); next(err); } }) @@ -133,7 +133,7 @@ router const result = await internalRedirectionHost.update(res.locals.access, payload); res.status(200).send(result); } catch (err) { - logger.debug(`${req.method.toUpperCase()} ${req.path}: ${err}`); + debug(logger, `${req.method.toUpperCase()} ${req.path}: ${err}`); next(err); } }) @@ -150,7 +150,7 @@ router }); res.status(200).send(result); } catch (err) { - logger.debug(`${req.method.toUpperCase()} ${req.path}: ${err}`); + debug(logger, `${req.method.toUpperCase()} ${req.path}: ${err}`); next(err); } }); @@ -177,7 +177,7 @@ router }); res.status(200).send(result); } catch (err) { - logger.debug(`${req.method.toUpperCase()} ${req.path}: ${err}`); + debug(logger, `${req.method.toUpperCase()} ${req.path}: ${err}`); next(err); } }); @@ -204,7 +204,7 @@ router }); res.status(200).send(result); } catch (err) { - logger.debug(`${req.method.toUpperCase()} ${req.path}: ${err}`); + debug(logger, `${req.method.toUpperCase()} ${req.path}: ${err}`); next(err); } }); diff --git a/backend/routes/nginx/streams.js b/backend/routes/nginx/streams.js index 878dd148..dec2e1a1 100644 --- a/backend/routes/nginx/streams.js +++ b/backend/routes/nginx/streams.js @@ -3,7 +3,7 @@ import internalStream from "../../internal/stream.js"; import jwtdecode from "../../lib/express/jwt-decode.js"; import apiValidator from "../../lib/validator/api.js"; import validator from "../../lib/validator/index.js"; -import { express as logger } from "../../logger.js"; +import { debug, express as logger } from "../../logger.js"; import { getValidationSchema } from "../../schema/index.js"; const router = express.Router({ @@ -49,7 +49,7 @@ router const rows = await internalStream.getAll(res.locals.access, data.expand, data.query); res.status(200).send(rows); } catch (err) { - logger.debug(`${req.method.toUpperCase()} ${req.path}: ${err}`); + debug(logger, `${req.method.toUpperCase()} ${req.path}: ${err}`); next(err); } }) @@ -65,7 +65,7 @@ router const result = await internalStream.create(res.locals.access, payload); res.status(201).send(result); } catch (err) { - logger.debug(`${req.method.toUpperCase()} ${req.path}: ${err}`); + debug(logger, `${req.method.toUpperCase()} ${req.path}: ${err}`); next(err); } }); @@ -113,7 +113,7 @@ router }); res.status(200).send(row); } catch (err) { - logger.debug(`${req.method.toUpperCase()} ${req.path}: ${err}`); + debug(logger, `${req.method.toUpperCase()} ${req.path}: ${err}`); next(err); } }) @@ -130,7 +130,7 @@ router const result = await internalStream.update(res.locals.access, payload); res.status(200).send(result); } catch (err) { - logger.debug(`${req.method.toUpperCase()} ${req.path}: ${err}`); + debug(logger, `${req.method.toUpperCase()} ${req.path}: ${err}`); next(err); } }) @@ -147,7 +147,7 @@ router }); res.status(200).send(result); } catch (err) { - logger.debug(`${req.method.toUpperCase()} ${req.path}: ${err}`); + debug(logger, `${req.method.toUpperCase()} ${req.path}: ${err}`); next(err); } }); @@ -174,7 +174,7 @@ router }); res.status(200).send(result); } catch (err) { - logger.debug(`${req.method.toUpperCase()} ${req.path}: ${err}`); + debug(logger, `${req.method.toUpperCase()} ${req.path}: ${err}`); next(err); } }); @@ -201,7 +201,7 @@ router }); res.status(200).send(result); } catch (err) { - logger.debug(`${req.method.toUpperCase()} ${req.path}: ${err}`); + debug(logger, `${req.method.toUpperCase()} ${req.path}: ${err}`); next(err); } }); diff --git a/backend/routes/reports.js b/backend/routes/reports.js index bd3a91fe..df9962ab 100644 --- a/backend/routes/reports.js +++ b/backend/routes/reports.js @@ -1,7 +1,7 @@ import express from "express"; import internalReport from "../internal/report.js"; import jwtdecode from "../lib/express/jwt-decode.js"; -import { express as logger } from "../logger.js"; +import { debug, express as logger } from "../logger.js"; const router = express.Router({ caseSensitive: true, @@ -24,7 +24,7 @@ router const data = await internalReport.getHostsReport(res.locals.access); res.status(200).send(data); } catch (err) { - logger.debug(`${req.method.toUpperCase()} ${req.path}: ${err}`); + debug(logger, `${req.method.toUpperCase()} ${req.path}: ${err}`); next(err); } }); diff --git a/backend/routes/schema.js b/backend/routes/schema.js index 71003f21..86bc1866 100644 --- a/backend/routes/schema.js +++ b/backend/routes/schema.js @@ -1,5 +1,5 @@ import express from "express"; -import { express as logger } from "../logger.js"; +import { debug, express as logger } from "../logger.js"; import PACKAGE from "../package.json" with { type: "json" }; import { getCompiledSchema } from "../schema/index.js"; @@ -36,7 +36,7 @@ router swaggerJSON.servers[0].url = `${origin}/api`; res.status(200).send(swaggerJSON); } catch (err) { - logger.debug(`${req.method.toUpperCase()} ${req.path}: ${err}`); + debug(logger, `${req.method.toUpperCase()} ${req.path}: ${err}`); next(err); } }); diff --git a/backend/routes/settings.js b/backend/routes/settings.js index 0439992c..ca4af656 100644 --- a/backend/routes/settings.js +++ b/backend/routes/settings.js @@ -3,7 +3,7 @@ import internalSetting from "../internal/setting.js"; import jwtdecode from "../lib/express/jwt-decode.js"; import apiValidator from "../lib/validator/api.js"; import validator from "../lib/validator/index.js"; -import { express as logger } from "../logger.js"; +import { debug, express as logger } from "../logger.js"; import { getValidationSchema } from "../schema/index.js"; const router = express.Router({ @@ -32,7 +32,7 @@ router const rows = await internalSetting.getAll(res.locals.access); res.status(200).send(rows); } catch (err) { - logger.debug(`${req.method.toUpperCase()} ${req.path}: ${err}`); + debug(logger, `${req.method.toUpperCase()} ${req.path}: ${err}`); next(err); } }); @@ -76,7 +76,7 @@ router }); res.status(200).send(row); } catch (err) { - logger.debug(`${req.method.toUpperCase()} ${req.path}: ${err}`); + debug(logger, `${req.method.toUpperCase()} ${req.path}: ${err}`); next(err); } }) @@ -93,7 +93,7 @@ router const result = await internalSetting.update(res.locals.access, payload); res.status(200).send(result); } catch (err) { - logger.debug(`${req.method.toUpperCase()} ${req.path}: ${err}`); + debug(logger, `${req.method.toUpperCase()} ${req.path}: ${err}`); next(err); } }); diff --git a/backend/routes/tokens.js b/backend/routes/tokens.js index 76e0dac0..b8599319 100644 --- a/backend/routes/tokens.js +++ b/backend/routes/tokens.js @@ -2,7 +2,7 @@ import express from "express"; import internalToken from "../internal/token.js"; import jwtdecode from "../lib/express/jwt-decode.js"; import apiValidator from "../lib/validator/api.js"; -import { express as logger } from "../logger.js"; +import { debug, express as logger } from "../logger.js"; import { getValidationSchema } from "../schema/index.js"; const router = express.Router({ @@ -32,7 +32,7 @@ router }); res.status(200).send(data); } catch (err) { - logger.debug(`${req.method.toUpperCase()} ${req.path}: ${err}`); + debug(logger, `${req.method.toUpperCase()} ${req.path}: ${err}`); next(err); } }) @@ -48,7 +48,7 @@ router const result = await internalToken.getTokenFromEmail(data); res.status(200).send(result); } catch (err) { - logger.debug(`${req.method.toUpperCase()} ${req.path}: ${err}`); + debug(logger, `${req.method.toUpperCase()} ${req.path}: ${err}`); next(err); } }); diff --git a/backend/routes/users.js b/backend/routes/users.js index db6656d5..7159b8b5 100644 --- a/backend/routes/users.js +++ b/backend/routes/users.js @@ -7,7 +7,7 @@ import jwtdecode from "../lib/express/jwt-decode.js"; import userIdFromMe from "../lib/express/user-id-from-me.js"; import apiValidator from "../lib/validator/api.js"; import validator from "../lib/validator/index.js"; -import { express as logger } from "../logger.js"; +import { debug, express as logger } from "../logger.js"; import { getValidationSchema } from "../schema/index.js"; import { isSetup } from "../setup.js"; @@ -61,7 +61,7 @@ router ); res.status(200).send(users); } catch (err) { - logger.debug(`${req.method.toUpperCase()} ${req.path}: ${err}`); + debug(logger, `${req.method.toUpperCase()} ${req.path}: ${err}`); next(err); } }) @@ -101,7 +101,7 @@ router const user = await internalUser.create(res.locals.access, payload); res.status(201).send(user); } catch (err) { - logger.debug(`${req.method.toUpperCase()} ${req.path}: ${err}`); + debug(logger, `${req.method.toUpperCase()} ${req.path}: ${err}`); next(err); } }) @@ -124,7 +124,7 @@ router await internalUser.deleteAll(); res.status(200).send(true); } catch (err) { - logger.debug(`${req.method.toUpperCase()} ${req.path}: ${err}`); + debug(logger, `${req.method.toUpperCase()} ${req.path}: ${err}`); next(err); } return; @@ -185,7 +185,7 @@ router }); res.status(200).send(user); } catch (err) { - logger.debug(`${req.method.toUpperCase()} ${req.path}: ${err}`); + debug(logger, `${req.method.toUpperCase()} ${req.path}: ${err}`); next(err); } }) @@ -205,7 +205,7 @@ router const result = await internalUser.update(res.locals.access, payload); res.status(200).send(result); } catch (err) { - logger.debug(`${req.method.toUpperCase()} ${req.path}: ${err}`); + debug(logger, `${req.method.toUpperCase()} ${req.path}: ${err}`); next(err); } }) @@ -222,7 +222,7 @@ router }); res.status(200).send(result); } catch (err) { - logger.debug(`${req.method.toUpperCase()} ${req.path}: ${err}`); + debug(logger, `${req.method.toUpperCase()} ${req.path}: ${err}`); next(err); } }); @@ -255,7 +255,7 @@ router const result = await internalUser.setPassword(res.locals.access, payload); res.status(200).send(result); } catch (err) { - logger.debug(`${req.method.toUpperCase()} ${req.path}: ${err}`); + debug(logger, `${req.method.toUpperCase()} ${req.path}: ${err}`); next(err); } }); @@ -291,7 +291,7 @@ router ); res.status(200).send(result); } catch (err) { - logger.debug(`${req.method.toUpperCase()} ${req.path}: ${err}`); + debug(logger, `${req.method.toUpperCase()} ${req.path}: ${err}`); next(err); } }); @@ -320,7 +320,7 @@ router }); res.status(200).send(result); } catch (err) { - logger.debug(`${req.method.toUpperCase()} ${req.path}: ${err}`); + debug(logger, `${req.method.toUpperCase()} ${req.path}: ${err}`); next(err); } });