File: handle-missing-log-file

package info (click to toggle)
lf 34%2Bds-2
  • links: PTS, VCS
  • area: main
  • in suites: trixie
  • size: 1,296 kB
  • sloc: sh: 126; makefile: 23; csh: 4
file content (62 lines) | stat: -rw-r--r-- 1,527 bytes parent folder | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
Description: Gracefully handle missing log file
Author: Joe Lim
Origin: upstream
Forwarded: not-needed
Applied-Upstream: https://github.com/gokcehan/lf/commit/ad6fa3fa736104ad3061797c6c74cf2e57ebe27d
Reviewed-by: Nick Morrott <nickm@debian.org>
Last-Update: 2025-05-04
---
--- a/client.go
+++ b/client.go
@@ -26,21 +26,10 @@
 }
 
 func run() {
-	var screen tcell.Screen
-	var err error
-	if screen, err = tcell.NewScreen(); err != nil {
-		log.Fatalf("creating screen: %s", err)
-	} else if err = screen.Init(); err != nil {
-		log.Fatalf("initializing screen: %s", err)
-	}
-	if gOpts.mouse {
-		screen.EnableMouse()
-	}
-
 	if gLogPath != "" {
 		f, err := os.OpenFile(gLogPath, os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0o600)
 		if err != nil {
-			panic(err)
+			log.Fatalf("failed to open log file: %s", err)
 		}
 		defer f.Close()
 		log.SetOutput(f)
@@ -50,6 +39,17 @@
 
 	log.Print("hi!")
 
+	var screen tcell.Screen
+	var err error
+	if screen, err = tcell.NewScreen(); err != nil {
+		log.Fatalf("creating screen: %s", err)
+	} else if err = screen.Init(); err != nil {
+		log.Fatalf("initializing screen: %s", err)
+	}
+	if gOpts.mouse {
+		screen.EnableMouse()
+	}
+
 	ui := newUI(screen)
 	nav := newNav(ui.wins[0].h)
 	app := newApp(ui, nav)
--- a/server.go
+++ b/server.go
@@ -19,7 +19,7 @@
 	if gLogPath != "" {
 		f, err := os.OpenFile(gLogPath, os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0o600)
 		if err != nil {
-			panic(err)
+			log.Fatalf("failed to open log file: %s", err)
 		}
 		defer f.Close()
 		log.SetOutput(f)