[cmd/tunneld] -d option

3 files changed, 24 insertions, 7 deletions

diff --git a/cmd/tunnel/main.go b/cmd/tunnel/main.go
index 49d9452..302b60e 100644
--- a/cmd/tunnel/main.go
+++ b/cmd/tunnel/main.go
@@ -8,6 +8,10 @@ import (
 	"tunnel/pkg/client"
 )
 
+func init() {
+	log.SetFlags(0)
+}
+
 func main() {
 	var args = os.Args
 
diff --git a/cmd/tunneld/main.go b/cmd/tunneld/main.go
index f713dea..ef274c8 100644
--- a/cmd/tunneld/main.go
+++ b/cmd/tunneld/main.go
@@ -1,6 +1,7 @@
 package main
 
 import (
+	"flag"
 	"log"
 	"os"
 	"os/signal"
@@ -8,7 +9,26 @@ import (
 	"tunnel/pkg/server"
 )
 
+var debugVar bool
+
+func init() {
+	flag.BoolVar(&debugVar, "d", false, "debug: print time and source info")
+}
+
+func initLog() {
+	var logFlags int
+
+	if debugVar {
+		logFlags |= log.Ldate | log.Ltime | log.Lshortfile
+	}
+
+	log.SetFlags(logFlags)
+}
+
 func main() {
+	flag.Parse()
+	initLog()
+
 	var c = make(chan os.Signal)
 
 	signal.Notify(c, syscall.SIGINT, syscall.SIGTERM)
diff --git a/pkg/config/log.go b/pkg/config/log.go
deleted file mode 100644
index 9aa24b6..0000000
--- a/pkg/config/log.go
+++ /dev/null
@@ -1,7 +0,0 @@
-package config
-
-import "log"
-
-func init() {
-	log.SetFlags(log.Lshortfile)
-}