Explorar o código

remove json parser from core

Darien Raymond %!s(int64=8) %!d(string=hai) anos
pai
achega
ee8d2ebfa9
Modificáronse 1 ficheiros con 1 adicións e 4 borrados
  1. 1 4
      main/config_json.go

+ 1 - 4
main/config_json.go

@@ -6,9 +6,7 @@ import (
 	"os/exec"
 
 	"v2ray.com/core"
-	"v2ray.com/core/app/log"
 	"v2ray.com/core/common/platform"
-	jsonconf "v2ray.com/ext/tools/conf/serial"
 )
 
 func jsonToProto(input io.Reader) (*core.Config, error) {
@@ -42,8 +40,7 @@ func init() {
 	core.RegisterConfigLoader(core.ConfigFormat_JSON, func(input io.Reader) (*core.Config, error) {
 		config, err := jsonToProto(input)
 		if err != nil {
-			log.Trace(newError("failed to execute v2ctl to convert config file.").Base(err).AtWarning())
-			return jsonconf.LoadJSONConfig(input)
+			return nil, newError("failed to execute v2ctl to convert config file.").Base(err)
 		}
 		return config, nil
 	})