log: Add syslog support

Gopkg.toml

@@ -22,9 +22,9 @@
 
 
 [[constraint]]
-  revision = "23def4e6c"
-  name = "github.com/golang/glog"
+  name = "github.com/sirupsen/logrus"
+  version = "v1.0.4"
 
 [[constraint]]
-  revision = "f5742cb6"
   name = "github.com/hashicorp/yamux"
+  revision = "f5742cb6"

proxy.go

@@ -12,24 +12,23 @@ import (
 	"flag"
 	"fmt"
 	"io"
+	"log/syslog"
 	"net"
 	"net/url"
 	"os"
 	"sync"
 
 	"github.com/hashicorp/yamux"
 	"github.com/sirupsen/logrus"
+	lSyslog "github.com/sirupsen/logrus/hooks/syslog"
 )
 
 const proxyName = "kata-proxy"
 
 // version is the proxy version. This variable is populated at build time.
 var version = "unknown"
 
-var proxyLog = logrus.WithFields(logrus.Fields{
-	"name": proxyName,
-	"pid":  os.Getpid(),
-})
+var proxyLog = logrus.New()
 
 func serve(servConn io.ReadWriteCloser, proto, addr string, results chan error) error {
 	session, err := yamux.Client(servConn, nil)
@@ -108,15 +107,27 @@ func unixAddr(uri string) (string, error) {
 	return addr.Host + addr.Path, nil
 }
 
+func logger() *logrus.Entry {
+	return proxyLog.WithFields(logrus.Fields{
+		"name": proxyName,
+		"pid":  os.Getpid(),
+	})
+}
+
 func setupLogger(logLevel string) error {
 	level, err := logrus.ParseLevel(logLevel)
 	if err != nil {
 		return err
 	}
 
-	logrus.SetLevel(level)
+	proxyLog.SetLevel(level)
+
+	hook, err := lSyslog.NewSyslogHook("", "", syslog.LOG_INFO, "")
+	if err == nil {
+		proxyLog.AddHook(hook)
+	}
 
-	proxyLog.WithField("version", version).Info()
+	logger().WithField("version", version).Info()
 
 	return nil
 }
@@ -141,36 +152,36 @@ func main() {
 
 	err := setupLogger(logLevel)
 	if err != nil {
-		proxyLog.Fatal(err)
+		logger().Fatal(err)
 	}
 
 	muxAddr, err := unixAddr(channel)
 	if err != nil {
-		proxyLog.Fatal("invalid mux socket address")
+		logger().Fatal("invalid mux socket address")
 	}
 	listenAddr, err := unixAddr(proxyAddr)
 	if err != nil {
-		proxyLog.Fatal("invalid listen socket address")
+		logger().Fatal("invalid listen socket address")
 		return
 	}
 
 	// yamux connection
 	servConn, err := net.Dial("unix", muxAddr)
 	if err != nil {
-		proxyLog.Fatalf("failed to dial channel(%q): %s", muxAddr, err)
+		logger().Fatalf("failed to dial channel(%q): %s", muxAddr, err)
 		return
 	}
 	defer servConn.Close()
 
 	results := make(chan error)
 	err = serve(servConn, "unix", listenAddr, results)
 	if err != nil {
-		proxyLog.Fatal(err)
+		logger().Fatal(err)
 	}
 
 	for err = range results {
 		if err != nil {
-			proxyLog.Fatal(err)
+			logger().Fatal(err)
 		}
 	}
 }