diff options
| author | Mikhail Osipov <mike.osipov@gmail.com> | 2020-04-09 02:15:56 +0300 |
|---|---|---|
| committer | Mikhail Osipov <mike.osipov@gmail.com> | 2020-04-09 16:03:13 +0300 |
| commit | 38b515c5470b74099b85a4f30aef2dce65600818 (patch) | |
| tree | 10a9e2399fd1db3a5f3a17110755144d4dac464c /pkg/server/env/env.go | |
| parent | 3c4432e0f2fb8ddf54a2e441063d584b99572a4e (diff) | |
add socket path config option, fix env find order
Diffstat (limited to 'pkg/server/env/env.go')
| -rw-r--r-- | pkg/server/env/env.go | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/pkg/server/env/env.go b/pkg/server/env/env.go index 16f5760..5a49532 100644 --- a/pkg/server/env/env.go +++ b/pkg/server/env/env.go @@ -51,13 +51,15 @@ func (e *env) Find(key string) (string, bool) { } func (e Env) Find(key string) (string, bool) { + if v, ok := e.env.Find(key); ok { + return v, ok + } + if e.p != nil { - if v, ok := e.p.Find(key); ok { - return v, ok - } + return e.p.Find(key) } - return e.env.Find(key) + return "", false } func (e Env) Get(key string) string { |