refactor(logging): add explicit category handling and align clientDebug facilities (user for UI/AJAX, daemon for cron)

Author: mstrhakr

source/compose.manager/compose.manager.settings.page

@@ -2141,27 +2141,27 @@ $acePath = file_exists('/usr/local/emhttp/plugins/dynamix/javascript/ace/ace.js'
             for (var i = 0; i < allowed.length; i++) {
                 var cfg = <?= json_encode($cfg); ?>;
                 var showCompose = (cfg['SHOW_COMPOSE_IN_HEADER_MENU'] || '').toString().toLowerCase();
-                composeClientDebug('Checking referrer path ' + ref.pathname + ' against allowed path ' + allowed[i] + ' with showCompose=' + showCompose, null, 'debug', 'daemon');
+                composeClientDebug('Checking referrer path ' + ref.pathname + ' against allowed path ' + allowed[i] + ' with showCompose=' + showCompose, null, 'user', 'debug', 'settings');
                 if (existingPath && existingPath.toLowerCase() === '/docker' && showCompose === 'true') {
-                    composeClientDebug('Referrer is /Docker and showCompose is true, returning /Compose', null, 'warn', 'daemon');
+                    composeClientDebug('Referrer is /Docker and showCompose is true, returning /Compose', null, 'user', 'warn', 'settings');
                     return '/Compose' + (ref.search || '');
                 } else if (existingPath && existingPath.toLowerCase() === '/compose' && showCompose === 'false') {
-                    composeClientDebug('Referrer is /Compose and showCompose is false, returning /Docker', null, 'warn', 'daemon');
+                    composeClientDebug('Referrer is /Compose and showCompose is false, returning /Docker', null, 'user', 'warn', 'settings');
                     return '/Docker' + (ref.search || '');
                 }
                 if (p.toLowerCase() === allowed[i].toLowerCase()) {
-                    composeClientDebug('Referrer matches allowed path ' + allowed[i], null, 'debug', 'daemon');
+                    composeClientDebug('Referrer matches allowed path ' + allowed[i], null, 'user', 'debug', 'settings');
                     return ref.pathname + (ref.search || '');
                 }
                 if (allowed[i].toLowerCase().endsWith('/') && p.toLowerCase().startsWith(allowed[i].toLowerCase())) {
-                    composeClientDebug('Referrer matches allowed path prefix ' + allowed[i], null, 'debug', 'daemon');
+                    composeClientDebug('Referrer matches allowed path prefix ' + allowed[i], null, 'user', 'debug', 'settings');
                     return ref.pathname + (ref.search || '');
                 }
             }
-            composeClientDebug('Referrer path ' + ref.pathname + ' does not match any allowed paths', null, 'warn', 'daemon');
+            composeClientDebug('Referrer path ' + ref.pathname + ' does not match any allowed paths', null, 'user', 'warn', 'settings');
             return null;
         } catch (e) {
-            composeClientDebug('Error parsing referrer URL: ' + e.message, null, 'error', 'daemon');
+            composeClientDebug('Error parsing referrer URL: ' + e.message, null, 'user', 'error', 'settings');
             return null;
         }
     }

source/compose.manager/include/AutoUpdate.php

@@ -153,7 +153,7 @@
         }
         // Security: validate path is under allowed directories
         if (!isAllowedAutoUpdatePath($path)) {
-            clientDebug("[autoupdate] Rejected invalid path: " . sanitizeLogText($path), null, 'daemon', 'error');
+            clientDebug('Rejected invalid path: ' . sanitizeLogText($path), null, 'user', 'error', 'autoupdate');
             http_response_code(403);
             echo json_encode(array('error' => 'Path not allowed'));
             break;
@@ -176,7 +176,7 @@
             $projectName = preg_replace('/[^A-Za-z0-9_\-]/', '_', $projectName);
         }
 
-        clientDebug("[autoupdate] Running manual auto-update for: $projectName", null, 'daemon', 'info');
+        clientDebug("Running manual auto-update for: $projectName", null, 'user', 'info', 'autoupdate');
 
         $script = $plugin_root . "scripts/compose_autoupdate.sh";
         // Allow overriding the shell command via environment for tests; default to sh

source/compose.manager/include/AutoUpdateRunner.php

@@ -49,7 +49,7 @@
 
     // Validate path is within allowed locations for security
     if (!isAllowedAutoUpdatePath($path)) {
-        clientDebug("[autoupdate] Skipping disallowed path: " . sanitizeLogText($path), null, 'daemon', 'warn');
+        clientDebug('Skipping disallowed path: ' . sanitizeLogText($path), null, 'daemon', 'warn', 'autoupdate');
         continue;
     }
 
@@ -109,7 +109,7 @@
         }
 
         // Log the scheduled auto-update trigger
-        clientDebug("[autoupdate] Scheduled auto-update triggered for: $projectName ($schedule)", null, 'daemon', 'info');
+        clientDebug("Scheduled auto-update triggered for: $projectName ($schedule)", null, 'daemon', 'info', 'autoupdate');
 
         $script = $plugin_root . "scripts/compose_autoupdate.sh";
         // Allow overriding the shell command via environment for tests; default to sh

source/compose.manager/include/BackupFunctions.php

@@ -123,7 +123,7 @@ function applyRetentionPolicy($destination)
         foreach ($toDelete as $archive) {
             $filePath = $destination . '/' . $archive['filename'];
             @unlink($filePath);
-            logger("Retention: deleted old backup " . $archive['filename']);
+            clientDebug("Retention: deleted old backup " . $archive['filename'], null, 'daemon', 'info', 'backup');
         }
     }
 }
@@ -336,17 +336,6 @@ function formatBytes($bytes)
     return $bytes . ' B';
 }
 
-/**
- * Log a message to syslog with compose.manager tag.
- * Guarded to avoid redeclaration when Helpers.php is also loaded.
- */
-if (!function_exists('logger')) {
-    function logger($message)
-    {
-        exec("logger -t 'compose.manager' " . escapeshellarg("[backup] " . $message));
-    }
-}
-
 /**
  * Resolve the full path to an archive given a filename.
  * Looks in the optional directory first, then configured destination, falls back to the provided path.