unitup 0.0.3 → 0.0.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "unitup",
-  "version": "0.0.3",
+  "version": "0.0.6",
   "description": "Minimal systemd user service wrapper for Node.js scripts",
   "main": "src/index.js",
   "types": "./index.d.ts",

package/src/systemd.js

@@ -480,30 +480,41 @@ export async function runJournalctlLogs(name, opts = {}) {
   const safeName = sanitizeServiceName(name);
   const unitFilename = getUnitFilename(safeName);
 
-  const args = ['--user', `_SYSTEMD_USER_UNIT=${unitFilename}`];
+  const baseArgs = ['-u', unitFilename];
 
   if (opts.cat || opts.output === 'cat') {
-    args.push('-o', 'cat');
+    baseArgs.push('-o', 'cat');
   } else if (opts.output) {
-    args.push('-o', opts.output);
+    baseArgs.push('-o', opts.output);
   }
 
   if (opts.follow) {
-    args.push('-f');
-    // Spawn stream for follow mode
+    baseArgs.push('-f');
     try {
-      const child = spawn('journalctl', args, { stdio: 'inherit', shell: false });
+      const child = spawn('journalctl', ['--user', ...baseArgs], { stdio: 'inherit', shell: false });
       child.on('error', () => {});
       return child;
     } catch {
       return null;
     }
   } else {
-    args.push('--no-pager');
+    baseArgs.push('--no-pager');
     const lines = opts.lines ? String(opts.lines) : '100';
-    args.push('-n', lines);
+    baseArgs.push('-n', lines);
+
+    // Try --user mode first
+    const userRes = await runCommand('journalctl', ['--user', ...baseArgs]);
+    const userOut = userRes.stdout || userRes.stderr || '';
+
+    // If user journal files do not exist or returned no entries, fallback to system journal
+    if (!userOut || userOut.includes('No journal files') || userOut.includes('No entries') || userRes.code !== 0) {
+      const sysRes = await runCommand('journalctl', baseArgs);
+      const sysOut = sysRes.stdout || sysRes.stderr || '';
+      if (sysOut && !sysOut.includes('No journal files')) {
+        return sysOut;
+      }
+    }
 
-    const res = await runCommand('journalctl', args);
-    return res.stdout || res.stderr || 'No logs found.';
+    return userOut || 'No logs found.';
   }
 }

package/src/unit.js

@@ -84,6 +84,7 @@ export function generateUnitContent(opts) {
     '',
     '[Service]',
     'Type=simple',
+    `SyslogIdentifier=unitup-${safeName}`,
     `WorkingDirectory=${cwd}`,
     `ExecStart=${execStartLine}`,
     `Restart=${restartPolicy}`,