diff --git a/src/app.js b/src/app.js index 7e94c95..6b31d21 100644 --- a/src/app.js +++ b/src/app.js @@ -8,7 +8,6 @@ const { startTokenCleanup } = require("./utils/tokenCleanup"); const SERVER_PORT = process.env.TEST_PORT || process.env.SERVER_PORT || 3400; -const CWD_LOG = `CWD: ${process.cwd()}`; const SERVER_LISTEN_LOG = (port) => `Server listening on http://localhost:${port}`; const NODE_ENV_LOG = `NODE_ENV: ${process.env.NODE_ENV}`; diff --git a/src/routes/secured/logs.js b/src/routes/secured/logs.js index 8144200..604a808 100644 --- a/src/routes/secured/logs.js +++ b/src/routes/secured/logs.js @@ -4,6 +4,8 @@ const path = require("path"); const fs = require("fs"); +const { winstonLogger } = require("../../utils/logging"); + const allowedLevels = ["warn", "error", "info", "debug", "functions", "notice"]; const logsDbPath = path.resolve(__dirname, "../../../data/logs.sqlite3"); @@ -122,13 +124,13 @@ }, }); } catch (error) { - console.error("Query error:", error); + winstonLogger.error("Query error:", error); res.status(500).json({ error: "Failed to query logs" }); } }); router.post("/logs/analytics", (req, res) => { - const event = req.query.event || "*"; - const date = req.query.date || "*"; + // const event = req.query.event || "*"; + // const date = req.query.date || "*"; const page = parseInt(req.query.page) || 1; const limit = parseInt(req.query.limit) || 50; const offset = (page - 1) * limit; @@ -160,7 +162,7 @@ analyticsDb.get(countQuery, params, (err, totalResult) => { if (err) { - console.error("Count query error:", err); + winstonLogger.error("Count query error:", err); return res.status(500).json({ error: "Failed to query logs" }); } @@ -190,7 +192,7 @@ analyticsDb.all(logsQuery, queryParams, (err, logs) => { if (err) { - console.error("Logs query error:", err); + winstonLogger.error("Logs query error:", err); return res.status(500).json({ error: "Failed to query logs" }); } @@ -209,7 +211,7 @@ }); }); } catch (error) { - console.error("Query error:", error); + winstonLogger.error("Query error:", error); res.status(500).json({ error: "Failed to query logs" }); } }); diff --git a/src/services/newsletterService.js b/src/services/newsletterService.js index 8eeae24..11ce5ef 100644 --- a/src/services/newsletterService.js +++ b/src/services/newsletterService.js @@ -3,6 +3,7 @@ const path = require("path"); const { FILE_PATH, ERRORS } = require("../constants/newsletterConstants"); const { validateAndSanitizeEmail } = require("../utils/emailValidator"); +const { winstonLogger } = require("../utils/logging"); let writeLock = Promise.resolve(); @@ -19,7 +20,7 @@ data = JSON.parse(file); } catch (e) { if (e.code !== "ENOENT" && !(e instanceof SyntaxError)) { - console.error(ERRORS.PARSE_FAILURE, e); + winstonLogger.error(ERRORS.PARSE_FAILURE, e); throw e; } } @@ -29,7 +30,7 @@ try { await fs.writeFile(FILE_PATH, JSON.stringify(data, null, 2)); } catch (err) { - console.error(ERRORS.WRITE_FAILURE, err); + winstonLogger.error(ERRORS.WRITE_FAILURE, err); throw err; } } @@ -50,7 +51,7 @@ } catch (e) { if (e.code === "ENOENT") return; if (!(e instanceof SyntaxError)) { - console.error(ERRORS.PARSE_FAILURE, e); + winstonLogger.error(ERRORS.PARSE_FAILURE, e); throw e; } } @@ -61,7 +62,7 @@ try { await fs.writeFile(FILE_PATH, JSON.stringify(data, null, 2)); } catch (err) { - console.error(ERRORS.WRITE_FAILURE, err); + winstonLogger.error(ERRORS.WRITE_FAILURE, err); throw err; } } diff --git a/src/utils/SQLiteTransport.js b/src/utils/SQLiteTransport.js index 095610a..ab9709a 100644 --- a/src/utils/SQLiteTransport.js +++ b/src/utils/SQLiteTransport.js @@ -1,6 +1,7 @@ const Transport = require("winston-transport"); const Database = require("better-sqlite3"); const path = require("path"); +const { winstonLogger } = require("./logging"); class SQLiteTransport extends Transport { constructor(opts) { @@ -106,7 +107,7 @@ try { insertLogTxn(); } catch (error) { - console.error("SQLite logging error:", error); + winstonLogger.error("SQLite logging error:", error); } callback(); diff --git a/src/utils/diskSpaceMonitor.js b/src/utils/diskSpaceMonitor.js index 730b734..14b28c5 100644 --- a/src/utils/diskSpaceMonitor.js +++ b/src/utils/diskSpaceMonitor.js @@ -53,7 +53,7 @@ usedGB: usedBytes / 1024 ** 3, }; } catch (error) { - console.error("Error getting disk space:", error); + winstonLogger.error("Error getting disk space:", error); return null; } } @@ -76,7 +76,7 @@ } } } catch (error) { - console.error(`Error calculating size for ${currentDir}:`, error); + winstonLogger.error(`Error calculating size for ${currentDir}:`, error); } }; diff --git a/src/utils/sendContactMail.js b/src/utils/sendContactMail.js index c4e0522..6ebe133 100644 --- a/src/utils/sendContactMail.js +++ b/src/utils/sendContactMail.js @@ -2,6 +2,7 @@ const path = require("path"); const fs = require("fs").promises; const { validateAndSanitizeEmail } = require("../utils/emailValidator"); +const { winstonLogger } = require("../utils/logging"); const MAIL_DOMAIN = process.env.MAIL_DOMAIN; const MAIL_USER = process.env.MAIL_USER; @@ -49,7 +50,7 @@ logs.push(emailLogEntry); await fs.writeFile(EMAIL_LOG_PATH, JSON.stringify(logs, null, 2)); } catch (err) { - console.error("Failed to log email to file:", err); + winstonLogger.error("Failed to log email to file:", err); throw err; } diff --git a/src/utils/sendNewsletterSubscriptionMail.js b/src/utils/sendNewsletterSubscriptionMail.js index 966f683..db48659 100644 --- a/src/utils/sendNewsletterSubscriptionMail.js +++ b/src/utils/sendNewsletterSubscriptionMail.js @@ -1,4 +1,5 @@ const transporter = require("./transporter"); +const { winstonLogger } = require("./logging"); const MAIL_DOMAIN = process.env.MAIL_DOMAIN; const MAIL_NEWSLETTER = process.env.MAIL_NEWSLETTER; @@ -19,7 +20,7 @@ try { return await transporter.sendMail(mailData); } catch (error) { - console.error(error); + winstonLogger.error(error); } } diff --git a/src/views/layouts/docs.handlebars b/src/views/layouts/docs.handlebars index 6a9d656..8ab7bac 100644 --- a/src/views/layouts/docs.handlebars +++ b/src/views/layouts/docs.handlebars @@ -2,19 +2,9 @@ - - - - - - {{{_sections.styles}}} - {{title}} - {{> favicon_headers }} - {{{_sections.headers}}} + {{> site_headers }} diff --git a/src/views/layouts/logs.handlebars b/src/views/layouts/logs.handlebars deleted file mode 100644 index e0b5520..0000000 --- a/src/views/layouts/logs.handlebars +++ /dev/null @@ -1,15 +0,0 @@ -{{!-- views/logs.hbs --}} - - - - - - Logs Viewer - - - - - {{{ body }}} - - - diff --git a/src/views/layouts/main.handlebars b/src/views/layouts/main.handlebars index 6deff25..41cbf67 100644 --- a/src/views/layouts/main.handlebars +++ b/src/views/layouts/main.handlebars @@ -2,18 +2,7 @@ - - - - - - {{{_sections.styles}}} - {{title}} - {{> favicon_headers }} - {{{_sections.headers}}} - + {{> site_headers }} diff --git a/src/views/partials/site_header.handlebars b/src/views/partials/site_header.handlebars deleted file mode 100644 index 093d978..0000000 --- a/src/views/partials/site_header.handlebars +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - {{{_sections.styles}}} - {{title}} - - - - - - {{{_sections.scripts}}} - - - diff --git a/src/views/partials/site_headers.handlebars b/src/views/partials/site_headers.handlebars new file mode 100644 index 0000000..646c817 --- /dev/null +++ b/src/views/partials/site_headers.handlebars @@ -0,0 +1,14 @@ + + + + + +{{{_sections.styles}}} + + + +{{title}} + +{{> favicon_headers }} + +{{{_sections.headers}}}