Skip to content

Commit

Permalink
update manager and rename some functions
Browse files Browse the repository at this point in the history
  • Loading branch information
AmrSaber committed Oct 13, 2024
1 parent a712a60 commit 1fe1dd9
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 12 deletions.
2 changes: 1 addition & 1 deletion src/commands/ping.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ var PingCommand = &cli.Command{
},
},
Action: func(c *cli.Context) error {
logger.ResetLoggers()
logger.ResetLoggersFlags()

quiet := c.Bool("quiet")
if quiet {
Expand Down
2 changes: 1 addition & 1 deletion src/commands/stop.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
20 changes: 11 additions & 9 deletions src/config/manager.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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
}
Expand Down
2 changes: 1 addition & 1 deletion src/lib/logger/logger.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ var (
Err = log.New(os.Stderr, "", log.LstdFlags|log.Lshortfile)
)

func ResetLoggers() {
func ResetLoggersFlags() {
Std.SetFlags(0)
Err.SetFlags(0)
}

0 comments on commit 1fe1dd9

Please sign in to comment.