diff options
Diffstat (limited to 'internal/toggledlog')
| -rw-r--r-- | internal/toggledlog/log.go | 65 | ||||
| -rw-r--r-- | internal/toggledlog/log_go1.4.go | 12 | ||||
| -rw-r--r-- | internal/toggledlog/log_go1.5.go | 17 | 
3 files changed, 94 insertions, 0 deletions
| diff --git a/internal/toggledlog/log.go b/internal/toggledlog/log.go new file mode 100644 index 0000000..4a2ad03 --- /dev/null +++ b/internal/toggledlog/log.go @@ -0,0 +1,65 @@ +package toggledlog + +import ( +	"encoding/json" +	"fmt" +	"log" +	"os" +) + +const ( +	ProgramName = "gocryptfs" +) + +func JSONDump(obj interface{}) string { +	b, err := json.MarshalIndent(obj, "", "\t") +	if err != nil { +		return err.Error() +	} else { +		return string(b) +	} +} + +// toggledLogger - a Logger than can be enabled and disabled +type toggledLogger struct { +	// Enable or disable output +	Enabled bool +	// Panic after logging a message, useful in regression tests +	PanicAfter bool +	*log.Logger +} + +func (l *toggledLogger) Printf(format string, v ...interface{}) { +	if !l.Enabled { +		return +	} +	l.Logger.Printf(format, v...) +	if l.PanicAfter { +		panic("PanicAfter: " + fmt.Sprintf(format, v...)) +	} +} +func (l *toggledLogger) Println(v ...interface{}) { +	if !l.Enabled { +		return +	} +	l.Logger.Println(v...) +	if l.PanicAfter { +		panic("PanicAfter: " + fmt.Sprintln(v...)) +	} +} + +// As defined by http://elinux.org/Debugging_by_printing#Log_Levels +// Debug messages +var Debug *toggledLogger + +// Informational message e.g. startup information +var Info *toggledLogger + +// A warning, meaning nothing serious by itself but might indicate problems +var Warn *toggledLogger + +func init() { +	Debug = &toggledLogger{false, false, log.New(os.Stdout, "", 0)} +	Info = &toggledLogger{true, false, log.New(os.Stdout, "", 0)} +	Warn = &toggledLogger{true, false, log.New(os.Stderr, "", 0)} +} diff --git a/internal/toggledlog/log_go1.4.go b/internal/toggledlog/log_go1.4.go new file mode 100644 index 0000000..4cdba44 --- /dev/null +++ b/internal/toggledlog/log_go1.4.go @@ -0,0 +1,12 @@ +// +build !go1.5 +// = go 1.4 or lower + +package toggledlog + +import ( +	"log/syslog" +) + +func (l *toggledLogger) SwitchToSyslog(p syslog.Priority) { +	Debug.Printf("Cannot switch to syslog - need Go 1.5 or higher") +} diff --git a/internal/toggledlog/log_go1.5.go b/internal/toggledlog/log_go1.5.go new file mode 100644 index 0000000..e8e71f9 --- /dev/null +++ b/internal/toggledlog/log_go1.5.go @@ -0,0 +1,17 @@ +// +build go1.5 +// = go 1.5 or higher + +package toggledlog + +import ( +	"log/syslog" +) + +func (l *toggledLogger) SwitchToSyslog(p syslog.Priority) { +	w, err := syslog.New(p, ProgramName) +	if err != nil { +		Warn.Printf("Cannot switch 0x%02x to syslog: %v", p, err) +	} else { +		l.SetOutput(w) +	} +} | 
