unitup 0.0.7 → 0.0.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "unitup",
-  "version": "0.0.7",
+  "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

@@ -481,8 +481,40 @@ export async function runJournalctlLogs(name, opts = {}) {
   const unitFilename = getUnitFilename(safeName);
   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) {
-    const followArgs = ['--user', '-u', unitFilename, '-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) {
@@ -497,42 +529,15 @@ export async function runJournalctlLogs(name, opts = {}) {
     }
   }
 
-  const candidateArgSets = [
-    ['--user', '-u', unitFilename],
-    ['--user', '-u', `unitup-${safeName}`],
-    ['--user', '-t', syslogId],
-    ['-u', unitFilename],
-    ['-u', `unitup-${safeName}`],
-    ['-t', syslogId]
-  ];
-
-  for (const candidateArgs of candidateArgSets) {
-    const args = [...candidateArgs, '--no-pager'];
-    if (opts.cat || opts.output === 'cat') {
-      args.push('-o', 'cat');
-    } else if (opts.output) {
-      args.push('-o', opts.output);
-    }
-    const lines = opts.lines ? String(opts.lines) : '100';
-    args.push('-n', lines);
-
-    const res = await runCommand('journalctl', args);
-    const out = (res.stdout || res.stderr || '').trim();
-
-    if (
-      out &&
-      !out.includes('No journal files') &&
-      !out.includes('No entries') &&
-      !out.includes('0 entries') &&
-      res.code === 0
-    ) {
-      return out;
-    }
+  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);
 
-  // Fallback return
-  const fallbackArgs = ['--user', '-u', unitFilename, '--no-pager', '-n', String(opts.lines || 100)];
-  if (opts.cat || opts.output === 'cat') fallbackArgs.push('-o', 'cat');
-  const defaultRes = await runCommand('journalctl', fallbackArgs);
-  return defaultRes.stdout || defaultRes.stderr || 'No logs found.';
+  const res = await runCommand('journalctl', staticArgs);
+  return res.stdout || res.stderr || 'No logs found.';
 }