Skip to content

High-performance browser automation bridge and multi-instance orchestrator with advanced stealth injection and real-time dashboard.

fix: preserve daemon log access across upgrades

Mario195f440d8c31
diff --git a/internal/daemon/launchd.go b/internal/daemon/launchd.go
index 3441172e..e50d63fc 100644
--- a/internal/daemon/launchd.go
+++ b/internal/daemon/launchd.go
@@ -121,10 +121,16 @@ func (m *launchdManager) Pid() (string, error) {
func (m *launchdManager) Logs(n int) (string, error) {
logPath := daemonStderrLogPath(m.env)
- if _, err := os.Stat(logPath); err != nil {
- return "No logs found at " + logPath, nil
+ if info, err := os.Stat(logPath); err == nil && info.Size() > 0 {
+ return runCommand(m.runner, "tail", "-n", fmt.Sprintf("%d", n), logPath)
}
- return runCommand(m.runner, "tail", "-n", fmt.Sprintf("%d", n), logPath)
+
+ legacyLogPath := "/tmp/pinchtab.err.log"
+ if _, err := os.Stat(legacyLogPath); err == nil {
+ return runCommand(m.runner, "tail", "-n", fmt.Sprintf("%d", n), legacyLogPath)
+ }
+
+ return "No logs found at " + logPath, nil
}
func (m *launchdManager) ManualInstructions() string {
diff --git a/internal/daemon/launchd_test.go b/internal/daemon/launchd_test.go
index 13bf7529..efd4133e 100644
--- a/internal/daemon/launchd_test.go
+++ b/internal/daemon/launchd_test.go
@@ -92,3 +92,42 @@ func TestLaunchdManagerPreflightRequiresGUIDomain(t *testing.T) {
t.Fatalf("unexpected error: %v", err)
}
}
+
+func TestLaunchdManagerLogsFallsBackToLegacyPath(t *testing.T) {
+ root := t.TempDir()
+ legacyLogPath := "/tmp/pinchtab.err.log"
+ legacyContent, legacyErr := os.ReadFile(legacyLogPath)
+ hadLegacy := legacyErr == nil
+ if err := os.WriteFile(legacyLogPath, []byte("legacy launchd log\n"), 0644); err != nil {
+ t.Fatalf("write legacy log: %v", err)
+ }
+ t.Cleanup(func() {
+ if hadLegacy {
+ _ = os.WriteFile(legacyLogPath, legacyContent, 0644)
+ } else {
+ _ = os.Remove(legacyLogPath)
+ }
+ })
+
+ runner := &fakeCommandRunner{
+ outputs: map[string]string{
+ "tail -n 20 /tmp/pinchtab.err.log": "tail output",
+ },
+ }
+ manager := &launchdManager{
+ env: environment{homeDir: root, osName: "darwin"},
+ runner: runner,
+ }
+
+ output, err := manager.Logs(20)
+ if err != nil {
+ t.Fatalf("Logs returned error: %v", err)
+ }
+ if output != "tail output" {
+ t.Fatalf("unexpected logs output: %q", output)
+ }
+ expected := "tail -n 20 /tmp/pinchtab.err.log"
+ if len(runner.calls) != 1 || runner.calls[0] != expected {
+ t.Fatalf("tail call = %v, want %q", runner.calls, expected)
+ }
+}
diff --git a/internal/daemon/systemd.go b/internal/daemon/systemd.go
index 944e4195..57d7d473 100644
--- a/internal/daemon/systemd.go
+++ b/internal/daemon/systemd.go
@@ -115,10 +115,11 @@ func (m *systemdUserManager) Pid() (string, error) {
func (m *systemdUserManager) Logs(n int) (string, error) {
logPath := daemonStderrLogPath(m.env)
- if _, err := os.Stat(logPath); err != nil {
- return "No logs found at " + logPath, nil
+ if info, err := os.Stat(logPath); err == nil && info.Size() > 0 {
+ return runCommand(m.runner, "tail", "-n", fmt.Sprintf("%d", n), logPath)
}
- return runCommand(m.runner, "tail", "-n", fmt.Sprintf("%d", n), logPath)
+
+ return runCommand(m.runner, "journalctl", "--user", "-u", pinchtabDaemonUnitName, "-n", fmt.Sprintf("%d", n), "--no-pager")
}
func (m *systemdUserManager) ManualInstructions() string {
diff --git a/internal/daemon/systemd_test.go b/internal/daemon/systemd_test.go
index fddd584b..e4a1c95e 100644
--- a/internal/daemon/systemd_test.go
+++ b/internal/daemon/systemd_test.go
@@ -82,3 +82,28 @@ func TestSystemdUserManagerPreflightRequiresUserSession(t *testing.T) {
t.Fatalf("unexpected error: %v", err)
}
}
+
+func TestSystemdUserManagerLogsFallsBackToJournalctl(t *testing.T) {
+ root := t.TempDir()
+ runner := &fakeCommandRunner{
+ outputs: map[string]string{
+ "journalctl --user -u pinchtab.service -n 15 --no-pager": "journalctl output",
+ },
+ }
+ manager := &systemdUserManager{
+ env: environment{homeDir: root, osName: "linux"},
+ runner: runner,
+ }
+
+ output, err := manager.Logs(15)
+ if err != nil {
+ t.Fatalf("Logs returned error: %v", err)
+ }
+ if output != "journalctl output" {
+ t.Fatalf("unexpected logs output: %q", output)
+ }
+ expected := "journalctl --user -u pinchtab.service -n 15 --no-pager"
+ if len(runner.calls) != 1 || runner.calls[0] != expected {
+ t.Fatalf("journalctl call = %v, want %q", runner.calls, expected)
+ }
+}