Skip to content

Commit 0d6e6fe

Browse files
committed
pw: configure syslog tag to contain the subcommand
Instead of: pw[1175704]: bus.go:83: starting webhook worker#2 pw[1175704]: bus.go:83: starting webhook worker#3 pw[1175704]: bus.go:83: starting webhook worker#1 pw[1175704]: bus.go:83: starting webhook worker#4 pw[1175704]: main.go:57: patchwork v4.0.0-rc4-1-g98a3cc54 listening on http://127.0.0.1:8888 Change to: pw-http[1175704]: bus.go:83: starting webhook worker#2 pw-http[1175704]: bus.go:83: starting webhook worker#3 pw-http[1175704]: bus.go:83: starting webhook worker#1 pw-http[1175704]: bus.go:83: starting webhook worker#4 pw-http[1175704]: main.go:57: patchwork v4.0.0-rc4-1-g98a3cc54 listening on http://127.0.0.1:8888 Signed-off-by: Robin Jarry <robin@jarry.cc>
1 parent 98a3cc5 commit 0d6e6fe

2 files changed

Lines changed: 2 additions & 4 deletions

File tree

‎cmd/pw/main.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ func main() {
6363
}
6464

6565
if cli.Syslog {
66-
log.InitSyslog()
66+
log.InitSyslog("pw-" + k.Command())
6767
k.Stderr = log.ErrLogger().Writer()
6868
}
6969

‎pkg/log/log.go‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import (
1010
"log"
1111
"log/syslog"
1212
"os"
13-
"path"
1413

1514
"golang.org/x/term"
1615
)
@@ -33,11 +32,10 @@ func newSyslog(tag string, prio syslog.Priority) *log.Logger {
3332
return log.New(w, "", log.Lshortfile)
3433
}
3534

36-
func InitSyslog() {
35+
func InitSyslog(tag string) {
3736
if term.IsTerminal(int(os.Stderr.Fd())) {
3837
return
3938
}
40-
tag := path.Base(os.Args[0])
4139
dbg = newSyslog(tag, syslog.LOG_DEBUG)
4240
notice = newSyslog(tag, syslog.LOG_NOTICE)
4341
info = newSyslog(tag, syslog.LOG_INFO)

0 commit comments

Comments
 (0)