[cmd/tunneld] add syslog option

2 files changed, 19 insertions, 10 deletions

diff --git a/cmd/tunnel/main.go b/cmd/tunnel/main.go
index 5c6029e..81bb88b 100644
--- a/cmd/tunnel/main.go
+++ b/cmd/tunnel/main.go
@@ -12,16 +12,16 @@ import (
 	"tunnel/pkg/config"
 )
 
-var systemSocketVar bool
+var (
+	systemFlag = flag.Bool("system", false, "use system instance")
+)
 
 func init() {
 	log.SetFlags(0)
-
-	flag.BoolVar(&systemSocketVar, "system", false, "use system instance")
 }
 
 func getSocketPath() string {
-	if systemSocketVar {
+	if *systemFlag {
 		return getSystemSocketPath()
 	}
 
diff --git a/cmd/tunneld/main.go b/cmd/tunneld/main.go
index cd8afda..6a16dec 100644
--- a/cmd/tunneld/main.go
+++ b/cmd/tunneld/main.go
@@ -4,6 +4,7 @@ import (
 	"errors"
 	"flag"
 	"log"
+	"log/syslog"
 	"os"
 	"os/signal"
 	"path"
@@ -12,20 +13,28 @@ import (
 	"tunnel/pkg/server"
 )
 
-var debugVar bool
-
-func init() {
-	flag.BoolVar(&debugVar, "d", false, "debug: print time and source info")
-}
+var (
+	debugFlag  = flag.Bool("d", false, "debug: print time and source info")
+	syslogFlag = flag.Bool("s", false, "log output to syslog instead of stdout")
+)
 
 func initLog() {
 	var logFlags int
 
-	if debugVar {
+	if *debugFlag {
 		logFlags |= log.Ldate | log.Ltime | log.Lshortfile
 	}
 
 	log.SetFlags(logFlags)
+
+	if *syslogFlag {
+		sysLog, err := syslog.New(syslog.LOG_INFO, "tunneld")
+		if err != nil {
+			log.Fatal(err)
+		}
+
+		log.SetOutput(sysLog)
+	}
 }
 
 func sighandler(c chan os.Signal, s *server.Server) {