From ea7c8bcfadd83797c9b81cb0e31b1a26b5b96a8c Mon Sep 17 00:00:00 2001 From: nadoo <287492+nadoo@users.noreply.github.com> Date: Tue, 26 Jun 2018 20:43:47 +0800 Subject: [PATCH] main: optimize code --- common/log/log.go | 7 +++---- features.go | 12 ------------ main.go | 9 +++++++++ features_linux.go => main_linux.go | 0 4 files changed, 12 insertions(+), 16 deletions(-) delete mode 100644 features.go rename features_linux.go => main_linux.go (100%) diff --git a/common/log/log.go b/common/log/log.go index 3022cab..9bf4e1c 100644 --- a/common/log/log.go +++ b/common/log/log.go @@ -6,15 +6,14 @@ import stdlog "log" type Func func(f string, v ...interface{}) // F is the main log function -var F Func = func(f string, v ...interface{}) { -} +var F Func = func(string, ...interface{}) {} // Fatal log and exit func Fatal(v ...interface{}) { - stdlog.Fatal(v) + stdlog.Fatal(v...) } // Fatalf log and exit func Fatalf(f string, v ...interface{}) { - stdlog.Fatalf(f, v) + stdlog.Fatalf(f, v...) } diff --git a/features.go b/features.go deleted file mode 100644 index 3bcb351..0000000 --- a/features.go +++ /dev/null @@ -1,12 +0,0 @@ -package main - -import ( - _ "github.com/nadoo/glider/proxy/http" - _ "github.com/nadoo/glider/proxy/mixed" - _ "github.com/nadoo/glider/proxy/socks5" - _ "github.com/nadoo/glider/proxy/ss" - _ "github.com/nadoo/glider/proxy/ssr" - _ "github.com/nadoo/glider/proxy/tcptun" - _ "github.com/nadoo/glider/proxy/udptun" - _ "github.com/nadoo/glider/proxy/uottun" -) diff --git a/main.go b/main.go index 6fe1c33..ffc8198 100644 --- a/main.go +++ b/main.go @@ -9,6 +9,15 @@ import ( "github.com/nadoo/glider/common/log" "github.com/nadoo/glider/proxy" + + _ "github.com/nadoo/glider/proxy/http" + _ "github.com/nadoo/glider/proxy/mixed" + _ "github.com/nadoo/glider/proxy/socks5" + _ "github.com/nadoo/glider/proxy/ss" + _ "github.com/nadoo/glider/proxy/ssr" + _ "github.com/nadoo/glider/proxy/tcptun" + _ "github.com/nadoo/glider/proxy/udptun" + _ "github.com/nadoo/glider/proxy/uottun" ) // VERSION . diff --git a/features_linux.go b/main_linux.go similarity index 100% rename from features_linux.go rename to main_linux.go