diff options
Diffstat (limited to 'internal/tlog')
| -rw-r--r-- | internal/tlog/log.go | 25 | ||||
| -rw-r--r-- | internal/tlog/log_go1.4.go | 16 | ||||
| -rw-r--r-- | internal/tlog/log_go1.5.go | 32 | 
3 files changed, 25 insertions, 48 deletions
| diff --git a/internal/tlog/log.go b/internal/tlog/log.go index bd8844b..720bb88 100644 --- a/internal/tlog/log.go +++ b/internal/tlog/log.go @@ -6,6 +6,7 @@ import (  	"encoding/json"  	"fmt"  	"log" +	"log/syslog"  	"os"  	"golang.org/x/crypto/ssh/terminal" @@ -117,3 +118,27 @@ func init() {  		postfix: ColorReset,  	}  } + +// SwitchToSyslog redirects the output of this logger to syslog. +func (l *toggledLogger) SwitchToSyslog(p syslog.Priority) { +	w, err := syslog.New(p, ProgramName) +	if err != nil { +		Warn.Printf("SwitchToSyslog: %v", err) +	} else { +		l.SetOutput(w) +	} +} + +// SwitchLoggerToSyslog redirects the default log.Logger that the go-fuse lib uses +// to syslog. +func SwitchLoggerToSyslog(p syslog.Priority) { +	w, err := syslog.New(p, ProgramName) +	if err != nil { +		Warn.Printf("SwitchLoggerToSyslog: %v", err) +	} else { +		log.SetPrefix("go-fuse: ") +		// Disable printing the timestamp, syslog already provides that +		log.SetFlags(0) +		log.SetOutput(w) +	} +} diff --git a/internal/tlog/log_go1.4.go b/internal/tlog/log_go1.4.go deleted file mode 100644 index 98d69db..0000000 --- a/internal/tlog/log_go1.4.go +++ /dev/null @@ -1,16 +0,0 @@ -// +build !go1.5 -// = go 1.4 or lower - -package tlog - -import ( -	"log/syslog" -) - -func (l *toggledLogger) SwitchToSyslog(p syslog.Priority) { -	Info.Printf("Cannot switch to syslog - need Go 1.5 or higher") -} - -func SwitchLoggerToSyslog(p syslog.Priority) { -	Info.Printf("Cannot switch to syslog - need Go 1.5 or higher") -} diff --git a/internal/tlog/log_go1.5.go b/internal/tlog/log_go1.5.go deleted file mode 100644 index 9c152d9..0000000 --- a/internal/tlog/log_go1.5.go +++ /dev/null @@ -1,32 +0,0 @@ -// +build go1.5 -// = go 1.5 or higher - -package tlog - -import ( -	"log" -	"log/syslog" -) - -func (l *toggledLogger) SwitchToSyslog(p syslog.Priority) { -	w, err := syslog.New(p, ProgramName) -	if err != nil { -		Warn.Printf("SwitchToSyslog: %v", err) -	} else { -		l.SetOutput(w) -	} -} - -// SwitchLoggerToSyslog redirects the default log.Logger that the go-fuse lib uses -// to syslog. -func SwitchLoggerToSyslog(p syslog.Priority) { -	w, err := syslog.New(p, ProgramName) -	if err != nil { -		Warn.Printf("SwitchLoggerToSyslog: %v", err) -	} else { -		log.SetPrefix("go-fuse: ") -		// Disable printing the timestamp, syslog already provides that -		log.SetFlags(0) -		log.SetOutput(w) -	} -} | 
