lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2025-06-02 05:44:08 -04:00
Code Issues Releases Wiki Activity

provide environment context on loading

Browse Source
This commit is contained in:
Shelikhoo 2021-09-05 15:37:26 +01:00
parent 141cd30ee3
commit 8982a38eb4
No known key found for this signature in database
GPG Key ID: C4D5E79D22B25316
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
infra/conf/v5cfg/common.go
View File

@ -1,11 +1,16 @@
package v5cfg package v5cfg
import ( import (
"context"
"encoding/json" "encoding/json"
"github.com/golang/protobuf/proto" "github.com/golang/protobuf/proto"
"github.com/v2fly/v2ray-core/v4/common/environment/envctx"
"github.com/v2fly/v2ray-core/v4/common/environment/envimpl"
"github.com/v2fly/v2ray-core/v4/common/registry" "github.com/v2fly/v2ray-core/v4/common/registry"
) )
func loadHeterogeneousConfigFromRawJson(interfaceType, name string, rawJson json.RawMessage) (proto.Message, error) { func loadHeterogeneousConfigFromRawJson(interfaceType, name string, rawJson json.RawMessage) (proto.Message, error) {
return registry.LoadImplementationByAlias(interfaceType, name, []byte(rawJson)) fsdef := envimpl.NewDefaultFileSystemDefaultImpl()
ctx := envctx.ContextWithEnvironment(context.TODO(), fsdef)
return registry.LoadImplementationByAlias(ctx, interfaceType, name, []byte(rawJson))
} }