use file instead of /dev/stdout

root · root · commit 36c9cc199540 · 2025-01-30T12:20:09.000-05:00
diff --git a/Makefile b/Makefile
@@ -11,6 +11,9 @@ install: all
 	install cbsd-mq-router /usr/local/sbin
 ifeq ($(UNAME_S),Linux)
 	install systemd/cbsd-mq-router.service /lib/systemd/system/cbsd-mq-router.service
+	@test -d /var/log/cbsdmq || mkdir -m 0755 /var/log/cbsdmq
+	@chown nobody:nogroup /var/log/cbsdmq
+	@test -r /etc/cbsd-mq-router.json || sed 's:/dev/stdout:/var/log/cbsdmq/stdout.log:g' etc/cbsd-mq-router.json > /etc/cbsd-mq-router.json
 else
 	install rc.d/cbsd-mq-router /usr/local/etc/rc.d/cbsd-mq-router
 endif
diff --git a/log.go b/log.go
@@ -32,7 +32,7 @@ func log_init(logfile string) {
 	f, err := os.OpenFile(logfile, os.O_RDWR|os.O_CREATE|os.O_APPEND, 0664)
 
 	if err != nil {
-		fmt.Printf("config load error: %s", err)
+		fmt.Printf("log_init: config load error: %s", err)
 		os.Exit(1)
 	}
 
diff --git a/main.go b/main.go
@@ -34,7 +34,7 @@ func main() {
 	config, err := LoadConfiguration(*configFile)
 
 	if err != nil {
-		fmt.Println("config load error")
+		fmt.Println("main: config load error")
 		os.Exit(1)
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ func log_init(logfile string) {`
`32`	`32`	`f, err := os.OpenFile(logfile, os.O_RDWR\|os.O_CREATE\|os.O_APPEND, 0664)`
`33`	`33`
`34`	`34`	`if err != nil {`
`35`		`- fmt.Printf("config load error: %s", err)`
	`35`	`+ fmt.Printf("log_init: config load error: %s", err)`
`36`	`36`	`os.Exit(1)`
`37`	`37`	`}`
`38`	`38`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ func main() {`
`34`	`34`	`config, err := LoadConfiguration(*configFile)`
`35`	`35`
`36`	`36`	`if err != nil {`
`37`		`- fmt.Println("config load error")`
	`37`	`+ fmt.Println("main: config load error")`
`38`	`38`	`os.Exit(1)`
`39`	`39`	`}`
`40`	`40`