diff --git a/server/logging.go b/server/logging.go
index 674c05be..428db03f 100644
--- a/server/logging.go
+++ b/server/logging.go
@@ -2,16 +2,22 @@ package weavedns
 
 import (
 	"io"
+	"io/ioutil"
 	"log"
+	"os"
+)
+
+const (
+	standard_log_flags = log.Ldate | log.Ltime | log.Lshortfile
 )
 
 // Inspired by http://www.goinggo.net/2013/11/using-log-package-in-go.html
 
 var (
-	Debug   *log.Logger
-	Info    *log.Logger
-	Warning *log.Logger
-	Error   *log.Logger
+	Debug   *log.Logger = log.New(ioutil.Discard, "DEBUG: ", standard_log_flags)
+	Info    *log.Logger = log.New(os.Stdout, "INFO: ", standard_log_flags)
+	Warning *log.Logger = log.New(os.Stdout, "WARNING: ", standard_log_flags)
+	Error   *log.Logger = log.New(os.Stdout, "ERROR: ", standard_log_flags)
 )
 
 func InitLogging(debugHandle io.Writer,
@@ -19,8 +25,8 @@ func InitLogging(debugHandle io.Writer,
 	warningHandle io.Writer,
 	errorHandle io.Writer) {
 
-	Debug = log.New(debugHandle, "DEBUG: ", log.Ldate|log.Ltime|log.Lshortfile)
-	Info = log.New(infoHandle, "INFO: ", log.Ldate|log.Ltime|log.Lshortfile)
-	Warning = log.New(warningHandle, "WARNING: ", log.Ldate|log.Ltime|log.Lshortfile)
-	Error = log.New(errorHandle, "ERROR: ", log.Ldate|log.Ltime|log.Lshortfile)
+	Debug = log.New(debugHandle, "DEBUG: ", standard_log_flags)
+	Info = log.New(infoHandle, "INFO: ", standard_log_flags)
+	Warning = log.New(warningHandle, "WARNING: ", standard_log_flags)
+	Error = log.New(errorHandle, "ERROR: ", standard_log_flags)
 }