fix(logs): track and report journalctl check errors

Address review feedback: capture errors from hasJournalctlLogs calls
and include diagnostic information when both user and system service
checks fail, improving troubleshooting.

commit: fd9e3fea5e4bf3f3028a870e938f94bd2e6f3800
author: brice · 9mo ago · 2026-01-16 05:11 UTC
parent: 6dbe27e
signature: unsigned

1 file · +15 -2

M internal/app/logs.go +15 -2


@@ -195,16 +195,29 @@ func hasJournalctl() bool {
195	195		// showJournalctlLog displays logs from journalctl.
196	196		// It first tries user service, then falls back to system service.
197	197		func showJournalctlLog(follow bool, lines int) error {
	198	+	var userErr, systemErr error
	199	+
198	200		// Try user service first (works without special permissions)
199		-	if hasLogs, _ := hasJournalctlLogs(true); hasLogs {
	201	+	hasLogs, err := hasJournalctlLogs(true)
	202	+	if err != nil {
	203	+	userErr = err
	204	+	} else if hasLogs {
200	205		return runJournalctl(follow, lines, true)
201	206		}
202	207
203	208		// Fall back to system service
204		-	if hasLogs, _ := hasJournalctlLogs(false); hasLogs {
	209	+	hasLogs, err = hasJournalctlLogs(false)
	210	+	if err != nil {
	211	+	systemErr = err
	212	+	} else if hasLogs {
205	213		return runJournalctl(follow, lines, false)
206	214		}
207	215
	216	+	// If either check failed with an error, include that information
	217	+	if userErr != nil \|\| systemErr != nil {
	218	+	return fmt.Errorf("gordon service not found in journalctl (user: %v, system: %v)", userErr, systemErr)
	219	+	}
	220	+
208	221		return fmt.Errorf("gordon service not found in journalctl: enable file logging in config.toml or run gordon as a systemd service")
209	222		}
210	223

 // showJournalctlLog displays logs from journalctl.
 // It first tries user service, then falls back to system service.
 func showJournalctlLog(follow bool, lines int) error {
+	var userErr, systemErr error
 	// Try user service first (works without special permissions)
-	if hasLogs, _ := hasJournalctlLogs(true); hasLogs {
+	hasLogs, err := hasJournalctlLogs(true)
+	if err != nil {
+		userErr = err
+	} else if hasLogs {
 		return runJournalctl(follow, lines, true)
 	}
 	// Fall back to system service
-	if hasLogs, _ := hasJournalctlLogs(false); hasLogs {
+	hasLogs, err = hasJournalctlLogs(false)
+	if err != nil {
+		systemErr = err
+	} else if hasLogs {
 		return runJournalctl(follow, lines, false)
 	}
+	// If either check failed with an error, include that information
+	if userErr != nil || systemErr != nil {
+		return fmt.Errorf("gordon service not found in journalctl (user: %v, system: %v)", userErr, systemErr)
+	}
 	return fmt.Errorf("gordon service not found in journalctl: enable file logging in config.toml or run gordon as a systemd service")
 }