sami7777/dashcaddy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: replace console.log/console.error with proper logging in monitoring and themes routes

Browse Source 
- monitoring.js: Added log dependency, replaced console.log with log.warn
- themes.js: Added log dependency, replaced console.error with log.error
- src/app.js: Pass log to monitoringRoutes and themesRoutes

This fixes error messages being lost to stdout instead of proper log files.
This commit is contained in:
Krystie
2026-05-01 02:24:59 -07:00
parent ea5acfa9a2
commit 2f1e2107bc
3 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
dashcaddy-api/routes/monitoring.js
View File

@@ -7,9 +7,10 @@ const { success } = require('../response-helpers');
* @param {Object} deps.resourceMonitor - Resource monitoring manager * @param {Object} deps.resourceMonitor - Resource monitoring manager
* @param {Object} deps.docker - Docker client wrapper * @param {Object} deps.docker - Docker client wrapper
* @param {Function} deps.asyncHandler - Async route handler wrapper * @param {Function} deps.asyncHandler - Async route handler wrapper
* @param {Object} deps.log - Logger instance
* @returns {express.Router} * @returns {express.Router}
*/ */
module.exports = function({ resourceMonitor, docker, asyncHandler }) { module.exports = function({ resourceMonitor, docker, asyncHandler, log }) {
const router = express.Router(); const router = express.Router();
// ===== RESOURCE MONITORING ENDPOINTS ===== // ===== RESOURCE MONITORING ENDPOINTS =====
@@ -119,7 +120,7 @@ module.exports = function({ resourceMonitor, docker, asyncHandler }) {
}); });
} catch (e) { } catch (e) {
// Skip containers we can't get stats for // Skip containers we can't get stats for
console.log(`Could not get stats for ${containerInfo.Names[0]}:`, e.message); log.warn('monitoring', `Could not get stats for ${containerInfo.Names[0]}`, { error: e.message });
} }
} }

5
dashcaddy-api/routes/themes.js
View File

@@ -8,9 +8,10 @@ const { ValidationError, NotFoundError } = require('../errors');
* Themes routes factory * Themes routes factory
* @param {Object} deps - Explicit dependencies * @param {Object} deps - Explicit dependencies
* @param {Function} deps.asyncHandler - Async route handler wrapper * @param {Function} deps.asyncHandler - Async route handler wrapper
* @param {Object} deps.log - Logger instance
* @returns {express.Router} * @returns {express.Router}
*/ */
module.exports = function({ asyncHandler }) { module.exports = function({ asyncHandler, log }) {
const router = express.Router(); const router = express.Router();
const THEMES_DIR = process.env.THEMES_DIR || path.join(path.dirname(process.env.SERVICES_FILE || '/app/services.json'), 'themes'); const THEMES_DIR = process.env.THEMES_DIR || path.join(path.dirname(process.env.SERVICES_FILE || '/app/services.json'), 'themes');
@@ -29,7 +30,7 @@ module.exports = function({ asyncHandler }) {
themes[slug] = data; themes[slug] = data;
} }
} catch (e) { } catch (e) {
console.error('[Themes] Failed to read themes:', e.message); log.error('themes', 'Failed to read themes', { error: e.message });
} }
return themes; return themes;
} }

5
dashcaddy-api/src/app.js
View File

@@ -359,7 +359,8 @@ async function createApp() {
apiRouter.use(monitoringRoutes({ apiRouter.use(monitoringRoutes({
resourceMonitor: ctx.resourceMonitor, resourceMonitor: ctx.resourceMonitor,
docker: ctx.docker, docker: ctx.docker,
asyncHandler: ctx.asyncHandler asyncHandler: ctx.asyncHandler,
log: ctx.log
})); }));
apiRouter.use(updatesRoutes({ apiRouter.use(updatesRoutes({
updateManager: ctx.updateManager, updateManager: ctx.updateManager,
@@ -420,7 +421,7 @@ async function createApp() {
asyncHandler: ctx.asyncHandler asyncHandler: ctx.asyncHandler
})); }));
apiRouter.use('/recipes', recipesRoutes(ctx)); apiRouter.use('/recipes', recipesRoutes(ctx));
apiRouter.use(themesRoutes({ asyncHandler: ctx.asyncHandler })); apiRouter.use(themesRoutes({ asyncHandler: ctx.asyncHandler, log: ctx.log }));
apiRouter.use('/docker', dockerResourcesRoutes({ apiRouter.use('/docker', dockerResourcesRoutes({
docker: ctx.docker, docker: ctx.docker,
asyncHandler: ctx.asyncHandler asyncHandler: ctx.asyncHandler