Skip to content

Commit c2909aa

Browse files
committed
Exclude syslog from windows targets.
1 parent 5c55c95 commit c2909aa

File tree

3 files changed

+60
-34
lines changed

3 files changed

+60
-34
lines changed

cmd/chirpstack-gateway-bridge/cmd/root_run.go

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
package cmd
22

33
import (
4-
"log/syslog"
54
"os"
65
"os/signal"
76
"syscall"
87

98
"github.com/pkg/errors"
109
log "github.com/sirupsen/logrus"
11-
lsyslog "github.com/sirupsen/logrus/hooks/syslog"
1210
"github.com/spf13/cobra"
1311

1412
"github.com/brocaar/chirpstack-gateway-bridge/internal/backend"
@@ -55,38 +53,6 @@ func setLogLevel() error {
5553
return nil
5654
}
5755

58-
func setSyslog() error {
59-
if !config.C.General.LogToSyslog {
60-
return nil
61-
}
62-
63-
var prio syslog.Priority
64-
65-
switch log.StandardLogger().Level {
66-
case log.DebugLevel:
67-
prio = syslog.LOG_USER | syslog.LOG_DEBUG
68-
case log.InfoLevel:
69-
prio = syslog.LOG_USER | syslog.LOG_INFO
70-
case log.WarnLevel:
71-
prio = syslog.LOG_USER | syslog.LOG_WARNING
72-
case log.ErrorLevel:
73-
prio = syslog.LOG_USER | syslog.LOG_ERR
74-
case log.FatalLevel:
75-
prio = syslog.LOG_USER | syslog.LOG_CRIT
76-
case log.PanicLevel:
77-
prio = syslog.LOG_USER | syslog.LOG_CRIT
78-
}
79-
80-
hook, err := lsyslog.NewSyslogHook("", "", prio, "chirpstack-gateway-bridge")
81-
if err != nil {
82-
return errors.Wrap(err, "get syslog hook error")
83-
}
84-
85-
log.AddHook(hook)
86-
87-
return nil
88-
}
89-
9056
func printStartMessage() error {
9157
log.WithFields(log.Fields{
9258
"version": version,
Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
// +build !windows
2+
3+
package cmd
4+
5+
import (
6+
"log/syslog"
7+
8+
"github.com/brocaar/chirpstack-gateway-bridge/internal/config"
9+
"github.com/pkg/errors"
10+
log "github.com/sirupsen/logrus"
11+
lsyslog "github.com/sirupsen/logrus/hooks/syslog"
12+
)
13+
14+
func setSyslog() error {
15+
if !config.C.General.LogToSyslog {
16+
return nil
17+
}
18+
19+
var prio syslog.Priority
20+
21+
switch log.StandardLogger().Level {
22+
case log.DebugLevel:
23+
prio = syslog.LOG_USER | syslog.LOG_DEBUG
24+
case log.InfoLevel:
25+
prio = syslog.LOG_USER | syslog.LOG_INFO
26+
case log.WarnLevel:
27+
prio = syslog.LOG_USER | syslog.LOG_WARNING
28+
case log.ErrorLevel:
29+
prio = syslog.LOG_USER | syslog.LOG_ERR
30+
case log.FatalLevel:
31+
prio = syslog.LOG_USER | syslog.LOG_CRIT
32+
case log.PanicLevel:
33+
prio = syslog.LOG_USER | syslog.LOG_CRIT
34+
}
35+
36+
hook, err := lsyslog.NewSyslogHook("", "", prio, "chirpstack-gateway-bridge")
37+
if err != nil {
38+
return errors.Wrap(err, "get syslog hook error")
39+
}
40+
41+
log.AddHook(hook)
42+
43+
return nil
44+
}
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
// +build windows
2+
3+
package cmd
4+
5+
import (
6+
"github.com/brocaar/chirpstack-gateway-bridge/internal/config"
7+
log "github.com/sirupsen/logrus"
8+
)
9+
10+
func setSyslog() error {
11+
if config.C.General.LogToSyslog {
12+
log.Fatal("syslog logging is not supported on Windows")
13+
}
14+
15+
return nil
16+
}

0 commit comments

Comments
 (0)