From f4ec85d3209d2f4a2828644d832d787d5a295039 Mon Sep 17 00:00:00 2001
From: Darien Raymond <admin@v2ray.com>
Date: Mon, 12 Feb 2018 11:40:42 +0100
Subject: [PATCH] fix loading of json config

---
 main/config_json.go | 43 +++++++++++++++++++++++++++++++++++--------
 1 file changed, 35 insertions(+), 8 deletions(-)

diff --git a/main/config_json.go b/main/config_json.go
index 5e294dddc..3a8b5819c 100644
--- a/main/config_json.go
+++ b/main/config_json.go
@@ -1,23 +1,35 @@
 package main
 
 import (
+	"context"
 	"io"
 	"os"
 	"os/exec"
 
 	"v2ray.com/core"
+	"v2ray.com/core/common"
 	"v2ray.com/core/common/platform"
+	"v2ray.com/core/common/signal"
 )
 
+type logWriter struct{}
+
+func (*logWriter) Write(b []byte) (int, error) {
+	n, err := os.Stderr.Write(b)
+	if err == nil {
+		os.Stderr.WriteString(platform.LineSeparator())
+	}
+	return n, err
+}
+
 func jsonToProto(input io.Reader) (*core.Config, error) {
 	v2ctl := platform.GetToolLocation("v2ctl")
-	_, err := os.Stat(v2ctl)
-	if err != nil {
+	if _, err := os.Stat(v2ctl); err != nil {
 		return nil, err
 	}
 	cmd := exec.Command(v2ctl, "config")
 	cmd.Stdin = input
-	cmd.Stderr = os.Stderr
+	cmd.Stderr = &logWriter{}
 	cmd.SysProcAttr = getSysProcAttr()
 
 	stdoutReader, err := cmd.StdoutPipe()
@@ -30,19 +42,34 @@ func jsonToProto(input io.Reader) (*core.Config, error) {
 		return nil, err
 	}
 
-	config, err := core.LoadConfig(core.ConfigFormat_Protobuf, stdoutReader)
+	var config *core.Config
 
-	cmd.Wait()
+	loadTask := signal.ExecuteAsync(func() error {
+		c, err := core.LoadConfig(core.ConfigFormat_Protobuf, stdoutReader)
+		if err != nil {
+			return err
+		}
+		config = c
+		return nil
+	})
 
-	return config, err
+	waitTask := signal.ExecuteAsync(func() error {
+		return cmd.Wait()
+	})
+
+	if err := signal.ErrorOrFinish2(context.Background(), loadTask, waitTask); err != nil {
+		return nil, err
+	}
+
+	return config, nil
 }
 
 func init() {
-	core.RegisterConfigLoader(core.ConfigFormat_JSON, func(input io.Reader) (*core.Config, error) {
+	common.Must(core.RegisterConfigLoader(core.ConfigFormat_JSON, func(input io.Reader) (*core.Config, error) {
 		config, err := jsonToProto(input)
 		if err != nil {
 			return nil, newError("failed to execute v2ctl to convert config file.").Base(err).AtWarning()
 		}
 		return config, nil
-	})
+	}))
 }