From c10faac9e5e3a36fc4c29ca73dae2092f9b8ddc8 Mon Sep 17 00:00:00 2001 From: aler9 <46489434+aler9@users.noreply.github.com> Date: Thu, 25 Mar 2021 20:30:36 +0100 Subject: [PATCH] move syslog into logger --- internal/logger/logger.go | 4 +--- internal/{syslog => logger}/syslog_unix.go | 7 ++----- internal/logger/syslog_win.go | 12 ++++++++++++ internal/syslog/syslog_win.go | 13 ------------- 4 files changed, 15 insertions(+), 21 deletions(-) rename internal/{syslog => logger}/syslog_unix.go (66%) create mode 100644 internal/logger/syslog_win.go delete mode 100644 internal/syslog/syslog_win.go diff --git a/internal/logger/logger.go b/internal/logger/logger.go index 4a05c6fe..57b74ed6 100644 --- a/internal/logger/logger.go +++ b/internal/logger/logger.go @@ -6,8 +6,6 @@ import ( "os" "sync" "time" - - "github.com/aler9/rtsp-simple-server/internal/syslog" ) // Level is a log level. @@ -63,7 +61,7 @@ func New(level Level, destinations map[Destination]struct{}, filePath string) (* if _, ok := destinations[DestinationSyslog]; ok { var err error - lh.syslog, err = syslog.New("rtsp-simple-server") + lh.syslog, err = newSyslog("rtsp-simple-server") if err != nil { lh.Close() return nil, err diff --git a/internal/syslog/syslog_unix.go b/internal/logger/syslog_unix.go similarity index 66% rename from internal/syslog/syslog_unix.go rename to internal/logger/syslog_unix.go index 1c5c8440..5561d127 100644 --- a/internal/syslog/syslog_unix.go +++ b/internal/logger/syslog_unix.go @@ -1,6 +1,6 @@ // +build !windows -package syslog +package logger import ( "io" @@ -11,8 +11,7 @@ type syslog struct { inner *native.Writer } -// New allocates a io.WriteCloser that writes to the system log. -func New(prefix string) (io.WriteCloser, error) { +func newSyslog(prefix string) (io.WriteCloser, error) { inner, err := native.New(native.LOG_INFO|native.LOG_DAEMON, prefix) if err != nil { return nil, err @@ -23,12 +22,10 @@ func New(prefix string) (io.WriteCloser, error) { }, nil } -// Close implements io.WriteCloser. func (ls *syslog) Close() error { return ls.inner.Close() } -// Write implements io.WriteCloser. func (ls *syslog) Write(p []byte) (int, error) { return ls.inner.Write(p) } diff --git a/internal/logger/syslog_win.go b/internal/logger/syslog_win.go new file mode 100644 index 00000000..594630f0 --- /dev/null +++ b/internal/logger/syslog_win.go @@ -0,0 +1,12 @@ +// +build windows + +package logger + +import ( + "fmt" + "io" +) + +func newSyslog(prefix string) (io.WriteCloser, error) { + return nil, fmt.Errorf("not implemented on windows") +} diff --git a/internal/syslog/syslog_win.go b/internal/syslog/syslog_win.go deleted file mode 100644 index de070cc0..00000000 --- a/internal/syslog/syslog_win.go +++ /dev/null @@ -1,13 +0,0 @@ -// +build windows - -package syslog - -import ( - "fmt" - "io" -) - -// New allocates a io.WriteCloser that writes to the system log. -func New(prefix string) (io.WriteCloser, error) { - return nil, fmt.Errorf("not implemented on windows") -}