diff --git a/src/common/env.go b/src/common/env.go index d6b7718..15326e8 100644 --- a/src/common/env.go +++ b/src/common/env.go @@ -7,7 +7,6 @@ import ( "github.com/sirupsen/logrus" ) -var IsRunningAsService = getEnvBool("GOPROXY_IS_SYSTEMD") var NoSchemaValidation = getEnvBool("GOPROXY_NO_SCHEMA_VALIDATION") var IsDebug = getEnvBool("GOPROXY_DEBUG") diff --git a/src/main.go b/src/main.go index 1f3e0de..4b549b0 100755 --- a/src/main.go +++ b/src/main.go @@ -32,19 +32,12 @@ func main() { logrus.SetLevel(logrus.DebugLevel) } - if common.IsRunningAsService { - logrus.SetFormatter(&logrus.TextFormatter{ - DisableColors: true, - DisableTimestamp: true, - DisableSorting: true, - }) - } else { - logrus.SetFormatter(&logrus.TextFormatter{ - DisableSorting: true, - FullTimestamp: true, - TimestampFormat: "01-02 15:04:05", - }) - } + logrus.SetFormatter(&logrus.TextFormatter{ + DisableSorting: true, + FullTimestamp: true, + ForceColors: true, + TimestampFormat: "01-02 15:04:05", + }) if args.Command == common.CommandReload { if err := apiUtils.ReloadServer(); err.IsNotNil() { diff --git a/src/proxy/provider/provider.go b/src/proxy/provider/provider.go index c2b02ed..a818443 100644 --- a/src/proxy/provider/provider.go +++ b/src/proxy/provider/provider.go @@ -155,7 +155,7 @@ func (p *Provider) loadRoutes() E.NestedError { e.Alias = a r, err := R.NewRoute(e) if err.IsNotNil() { - errors.Addf("%s: %w", a, err) + errors.Add(err.Subject(a)) p.l.Debugf("failed to load route: %s, %s", a, err) } else { p.routes.Set(a, r) diff --git a/src/route/http_route.go b/src/route/http_route.go index 1e85195..5c2247e 100755 --- a/src/route/http_route.go +++ b/src/route/http_route.go @@ -67,7 +67,7 @@ func NewHTTPRoute(entry *P.Entry) (*HTTPRoute, E.NestedError) { path := entry.Path.String() if _, exists := r.Subroutes[path]; exists { httpRoutes.Unlock() - return nil, E.Duplicated("path", path).Subject(entry.Alias) + return nil, E.Duplicated("path", path) } r.mux.HandleFunc(path, rp.ServeHTTP) if err := recover(); err != nil { @@ -75,9 +75,9 @@ func NewHTTPRoute(entry *P.Entry) (*HTTPRoute, E.NestedError) { switch t := err.(type) { case error: // NOTE: likely path pattern error - return nil, E.From(t).Subject(entry.Alias) + return nil, E.From(t) default: - return nil, E.From(fmt.Errorf("%v", t)).Subject(entry.Alias) + return nil, E.From(fmt.Errorf("%v", t)) } }