diff --git a/src/commands/ping.go b/src/commands/ping.go index 1340032..b5a5b96 100644 --- a/src/commands/ping.go +++ b/src/commands/ping.go @@ -22,7 +22,7 @@ var PingCommand = &cli.Command{ }, }, Action: func(c *cli.Context) error { - logger.ResetLoggers() + logger.ResetLoggersFlags() quiet := c.Bool("quiet") if quiet { diff --git a/src/commands/stop.go b/src/commands/stop.go index 0aa7280..8ffe8b7 100644 --- a/src/commands/stop.go +++ b/src/commands/stop.go @@ -15,7 +15,7 @@ var StopCommand = &cli.Command{ Name: "stop", Usage: "stops the server", Action: func(c *cli.Context) error { - logger.ResetLoggers() + logger.ResetLoggersFlags() conn, err := net.Dial("unix", utils.SOCKET_PATH) if err != nil { diff --git a/src/config/manager.go b/src/config/manager.go index 514b6fc..4ceb3b3 100644 --- a/src/config/manager.go +++ b/src/config/manager.go @@ -42,14 +42,16 @@ func (manager *ConfigManager) GetRedirect(domain string) *models.Redirect { return active.RunCommandSync( manager.active, func() *models.Redirect { - if manager.config.IsStale() { - manager.loadConfigUnsafe() - } - - if manager.config.UrlConfigRefresh.RemapAfterRefresh { - manager.refreshConfig(domain) - } else { - manager.active.DispatchCommand(func() { manager.refreshConfig(domain) }) + if manager.config.Source == models.SOURCE_URL { + if manager.config.IsStale() { + manager.loadConfigUnsafe() + } + + if manager.config.UrlConfigRefresh.RemapAfterRefresh { + manager.refreshConfigUnsafe(domain) + } else { + manager.active.DispatchCommand(func() { manager.refreshConfigUnsafe(domain) }) + } } return manager.matchRedirect(domain) @@ -69,7 +71,7 @@ func (manager *ConfigManager) matchRefreshDomain(domain string) *models.RefreshD ) } -func (manager *ConfigManager) refreshConfig(domain string) { +func (manager *ConfigManager) refreshConfigUnsafe(domain string) { if manager.config.Source != models.SOURCE_URL { return } diff --git a/src/lib/logger/logger.go b/src/lib/logger/logger.go index 218e127..9e50078 100644 --- a/src/lib/logger/logger.go +++ b/src/lib/logger/logger.go @@ -10,7 +10,7 @@ var ( Err = log.New(os.Stderr, "", log.LstdFlags|log.Lshortfile) ) -func ResetLoggers() { +func ResetLoggersFlags() { Std.SetFlags(0) Err.SetFlags(0) }