Support specifying config file on command line.

dearplain · Dec 14, 2012 · fa17143 · fa17143
1 parent c62ef73
commit fa17143
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/cmd/shadowsocks-local/local.go b/cmd/shadowsocks-local/local.go
@@ -4,6 +4,7 @@ import (
 	"bytes"
 	"encoding/binary"
 	"errors"
+	"flag"
 	ss "github.com/shadowsocks/shadowsocks-go/shadowsocks"
 	"io"
 	"log"
@@ -195,7 +196,11 @@ func run(port, password, server string) {
 }
 
 func main() {
-	config := ss.ParseConfig("config.json")
+	var configFile string
+	flag.StringVar(&configFile, "c", "config.json", "specify config file")
+	flag.Parse()
+
+	config := ss.ParseConfig(configFile)
 	debug = ss.Debug
 	run(strconv.Itoa(config.LocalPort), config.Password,
 		config.Server+":"+strconv.Itoa(config.ServerPort))

diff --git a/cmd/shadowsocks-server/server.go b/cmd/shadowsocks-server/server.go
@@ -4,6 +4,7 @@ import (
 	"bytes"
 	"encoding/binary"
 	"errors"
+	"flag"
 	ss "github.com/shadowsocks/shadowsocks-go/shadowsocks"
 	"log"
 	"net"
@@ -162,7 +163,11 @@ func run(port, password string) {
 }
 
 func main() {
-	config := ss.ParseConfig("config.json")
+	var configFile string
+	flag.StringVar(&configFile, "c", "config.json", "specify config file")
+	flag.Parse()
+
+	config := ss.ParseConfig(configFile)
 	debug = ss.Debug
 	if len(config.PortPassword) == 0 {
 		run(strconv.Itoa(config.ServerPort), config.Password)