From 38b515c5470b74099b85a4f30aef2dce65600818 Mon Sep 17 00:00:00 2001 From: Mikhail Osipov Date: Thu, 9 Apr 2020 02:15:56 +0300 Subject: add socket path config option, fix env find order --- pkg/server/env/env.go | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'pkg/server') 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 { -- cgit v1.2.3-70-g09d2