Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: export (const.)core.v2rayKey #831

Merged
merged 2 commits into from
Apr 2, 2021
Merged

feat: export (const.)core.v2rayKey #831

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
98c4942
comment on.
rurirei Mar 31, 2021
3cf53a4
rename to V2rayKeyValue
rurirei Mar 31, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions context.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,12 @@ import (
// V2rayKey is the key type of Instance in Context, exported for test.
type V2rayKey int

const v2rayKey V2rayKey = 1
// V2rayKeyValue is the key value of Instance in Context, exported for test.
const V2rayKeyValue V2rayKey = 1

// FromContext returns an Instance from the given context, or nil if the context doesn't contain one.
func FromContext(ctx context.Context) *Instance {
if s, ok := ctx.Value(v2rayKey).(*Instance); ok {
if s, ok := ctx.Value(V2rayKeyValue).(*Instance); ok {
return s
}
return nil
Expand Down
2 changes: 1 addition & 1 deletion functions.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (
func CreateObject(v *Instance, config interface{}) (interface{}, error) {
var ctx context.Context
if v != nil {
ctx = context.WithValue(v.ctx, v2rayKey, v)
ctx = context.WithValue(v.ctx, V2rayKeyValue, v)
}
return common.CreateObject(ctx, config)
}
Expand Down