From df41183e9b86ffd152203f4addfb649319b2cb6e Mon Sep 17 00:00:00 2001
From: Jakob Unterwurzacher
Date: Fri, 22 Jan 2016 21:39:35 +0100
Subject: Disable syslog in Go 1.4 and lower (method SetOutput does not exist)

---
 cryptfs/log.go       |  9 ---------
 cryptfs/log_go1.4.go |  8 ++++++++
 cryptfs/log_go1.5.go | 17 +++++++++++++++++
 3 files changed, 25 insertions(+), 9 deletions(-)
 create mode 100644 cryptfs/log_go1.4.go
 create mode 100644 cryptfs/log_go1.5.go

(limited to 'cryptfs')

diff --git a/cryptfs/log.go b/cryptfs/log.go
index a5b5115..44cb84f 100644
--- a/cryptfs/log.go
+++ b/cryptfs/log.go
@@ -3,7 +3,6 @@ package cryptfs
 import (
 	"encoding/json"
 	"log"
-	"log/syslog"
 	"os"
 )
 
@@ -34,14 +33,6 @@ func (l *toggledLogger) Println(v ...interface{}) {
 	}
 	l.Logger.Println(v...)
 }
-func (l *toggledLogger) SwitchToSyslog(p syslog.Priority) {
-	w, err := syslog.New(p, PROGRAM_NAME)
-	if err != nil {
-		Warn.Printf("Cannot switch 0x%02x to syslog: %v", p, err)
-	} else {
-		l.SetOutput(w)
-	}
-}
 
 // As defined by http://elinux.org/Debugging_by_printing#Log_Levels
 // Debug messages
diff --git a/cryptfs/log_go1.4.go b/cryptfs/log_go1.4.go
new file mode 100644
index 0000000..6bc6457
--- /dev/null
+++ b/cryptfs/log_go1.4.go
@@ -0,0 +1,8 @@
+// +build !go1.5
+// = go 1.4 or lower
+
+package cryptfs
+
+func (l *toggledLogger) SwitchToSyslog(p syslog.Priority) {
+	Debug.Printf("Cannot switch to syslog - need Go 1.5 or higher")
+}
diff --git a/cryptfs/log_go1.5.go b/cryptfs/log_go1.5.go
new file mode 100644
index 0000000..8daae9c
--- /dev/null
+++ b/cryptfs/log_go1.5.go
@@ -0,0 +1,17 @@
+// +build go1.5
+// = go 1.5 or higher
+
+package cryptfs
+
+import (
+	"log/syslog"
+)
+
+func (l *toggledLogger) SwitchToSyslog(p syslog.Priority) {
+	w, err := syslog.New(p, PROGRAM_NAME)
+	if err != nil {
+		Warn.Printf("Cannot switch 0x%02x to syslog: %v", p, err)
+	} else {
+		l.SetOutput(w)
+	}
+}
-- 
cgit v1.2.3