unitup 0.0.6 → 0.0.8

package/package.json

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

package/src/systemd.js

@@ -479,42 +479,65 @@ export async function listServices() {
 export async function runJournalctlLogs(name, opts = {}) {
   const safeName = sanitizeServiceName(name);
   const unitFilename = getUnitFilename(safeName);
-
-  const baseArgs = ['-u', unitFilename];
-
-  if (opts.cat || opts.output === 'cat') {
-    baseArgs.push('-o', 'cat');
-  } else if (opts.output) {
-    baseArgs.push('-o', opts.output);
+  const syslogId = `unitup-${safeName}`;
+
+  const candidateArgSets = [
+    ['--user', '-u', unitFilename],
+    ['--user', '-u', `unitup-${safeName}`],
+    ['--user', '-t', syslogId],
+    ['-u', unitFilename],
+    ['-u', `unitup-${safeName}`],
+    ['-t', syslogId]
+  ];
+
+  let chosenCandidate = null;
+
+  for (const candidateArgs of candidateArgSets) {
+    const testArgs = [...candidateArgs, '--no-pager', '-n', '1'];
+    const res = await runCommand('journalctl', testArgs);
+    const out = (res.stdout || res.stderr || '').trim();
+
+    if (res.code === 0 && !out.includes('No journal files')) {
+      if (!chosenCandidate) {
+        chosenCandidate = candidateArgs;
+      }
+      if (!out.includes('No entries') && !out.includes('0 entries')) {
+        chosenCandidate = candidateArgs;
+        break;
+      }
+    }
   }
 
+  const workingCandidate = chosenCandidate || ['--user', '-u', unitFilename];
+
   if (opts.follow) {
-    baseArgs.push('-f');
+    const followArgs = [...workingCandidate, '-f'];
+    if (opts.lines) {
+      followArgs.push('-n', String(opts.lines));
+    }
+    if (opts.cat || opts.output === 'cat') {
+      followArgs.push('-o', 'cat');
+    } else if (opts.output) {
+      followArgs.push('-o', opts.output);
+    }
     try {
-      const child = spawn('journalctl', ['--user', ...baseArgs], { stdio: 'inherit', shell: false });
+      const child = spawn('journalctl', followArgs, { stdio: 'inherit', shell: false });
       child.on('error', () => {});
       return child;
     } catch {
       return null;
     }
-  } else {
-    baseArgs.push('--no-pager');
-    const lines = opts.lines ? String(opts.lines) : '100';
-    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;
-      }
-    }
+  }
 
-    return userOut || 'No logs found.';
+  const staticArgs = [...workingCandidate, '--no-pager'];
+  if (opts.cat || opts.output === 'cat') {
+    staticArgs.push('-o', 'cat');
+  } else if (opts.output) {
+    staticArgs.push('-o', opts.output);
   }
+  const lines = opts.lines ? String(opts.lines) : '100';
+  staticArgs.push('-n', lines);
+
+  const res = await runCommand('journalctl', staticArgs);
+  return res.stdout || res.stderr || 'No logs found.';
 }