ParseConfig return err instead of exit.

cmd/shadowsocks-local/local.go

@@ -194,7 +194,10 @@ func main() {
 	flag.StringVar(&configFile, "c", "config.json", "specify config file")
 	flag.Parse()
 
-	config := ss.ParseConfig(configFile)
+	config, err := ss.ParseConfig(configFile)
+	if err != nil {
+		return
+	}
 	debug = ss.Debug
 	run(strconv.Itoa(config.LocalPort), config.Password,
 		config.Server+":"+strconv.Itoa(config.ServerPort))

cmd/shadowsocks-server/server.go

@@ -155,7 +155,10 @@ func main() {
 	flag.StringVar(&configFile, "c", "config.json", "specify config file")
 	flag.Parse()
 
-	config := ss.ParseConfig(configFile)
+	config, err := ss.ParseConfig(configFile)
+	if err != nil {
+		return
+	}
 	debug = ss.Debug
 	if len(config.PortPassword) == 0 {
 		run(strconv.Itoa(config.ServerPort), config.Password)

shadowsocks/config.go

@@ -27,21 +27,26 @@ type Config struct {
 
 var readTimeout time.Duration
 
-func ParseConfig(path string) *Config {
+func ParseConfig(path string) (config *Config, err error) {
 	file, err := os.Open(path) // For read access.
 	if err != nil {
-		log.Fatal("error opening config file:", err)
+		log.Println("error opening config file:", err)
+		return
 	}
 	defer file.Close()
+
 	data, err := ioutil.ReadAll(file)
 	if err != nil {
-		log.Fatalln("error reading config:", err)
+		log.Println("error reading config:", err)
+		return
 	}
-	var config Config
-	if err = json.Unmarshal(data, &config); err != nil {
-		log.Fatalln("can not parse config:", err)
+
+	config = &Config{}
+	if err = json.Unmarshal(data, config); err != nil {
+		log.Println("can not parse config:", err)
+		return nil, err
 	}
 	Debug = DebugLog(config.Debug)
 	readTimeout = time.Duration(config.Timeout) * time.Second
-	return &config
+	return
 }