diff --git a/src/middleware/hbs.js b/src/middleware/hbs.js index 47dcb3b..08f9660 100644 --- a/src/middleware/hbs.js +++ b/src/middleware/hbs.js @@ -12,7 +12,9 @@ helpers: { section(name, options) { this._sections ??= {}; - this._sections[name] = options.fn(this); + this._sections[name] ??= ""; + this._sections[name] += options.fn(this); + req.log.debug(name, this._sections); return null; }, }, diff --git a/src/routes/logs.js b/src/routes/logs.js index 7fc4776..c6d205f 100644 --- a/src/routes/logs.js +++ b/src/routes/logs.js @@ -6,7 +6,6 @@ const secured = require("../middleware/secured"); const allowedLevels = ["warn", "error", "info", "debug", "functions", "notice"]; -const allowedTypes = ["testing", "live", "dev"]; const dbPath = path.resolve(__dirname, "../../data/logs.sqlite3"); @@ -27,16 +26,16 @@ }); router.post("/logs", secured, (req, res) => { - const log_type = req.query.log_type || "*"; + // const log_type = req.query.log_type || "*"; const log_level = req.query.log_level || "*"; const date = req.query.date || "*"; if (log_level !== "*" && !allowedLevels.includes(log_level)) { return res.status(400).json({ error: "Invalid log_level" }); } - if (log_type !== "*" && !allowedTypes.includes(log_type)) { - return res.status(400).json({ error: "Invalid log_type" }); - } + // if (log_type !== "*" && !allowedTypes.includes(log_type)) { + // return res.status(400).json({ error: "Invalid log_type" }); + // } const conditions = []; const params = []; @@ -51,14 +50,14 @@ params.push(date); } - if (log_type !== "*") { - conditions.push(`EXISTS ( - SELECT 1 FROM log_metadata m - JOIN keys k ON k.id = m.key_id - WHERE m.log_id = l.id AND k.key = 'type' AND m.value = ? - )`); - params.push(log_type); - } + // if (log_type !== "*") { + // conditions.push(`EXISTS ( + // SELECT 1 FROM log_metadata m + // JOIN keys k ON k.id = m.key_id + // WHERE m.log_id = l.id AND k.key = 'type' AND m.value = ? + // )`); + // params.push(log_type); + // } const whereClause = conditions.length ? "WHERE " + conditions.join(" AND ") diff --git a/src/views/pages/logs.handlebars b/src/views/pages/logs.handlebars index 69eb7bb..7ead8ea 100644 --- a/src/views/pages/logs.handlebars +++ b/src/views/pages/logs.handlebars @@ -8,6 +8,7 @@

Log Viewer

+ {{!-- + --}}