CalvinBackup/ctrld
1
0
Fork 0
mirror of https://github.com/Control-D-Inc/ctrld.git synced 2026-02-03 22:18:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

cmd/ctrld: use Windscribe fork of zerolog

Browse Source 
For supporting default log level notice. While at it, also fix a missing
os.Exit call when setup router on non-supported platforms.
This commit is contained in:
Cuong Manh Le
2023-05-04 00:05:52 +07:00
committed by Cuong Manh Le
parent e3a792d50d
commit 24100c4cbe
5 changed files with 21 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
cmd/ctrld/cli.go
View File

@@ -335,7 +335,7 @@ func initCLI() {
status = selfCheckStatus(status)
switch status {
case service.StatusRunning:
mainLog.Warn().Msg("Service started")
mainLog.Notice().Msg("Service started")
default:
mainLog.Error().Msg("Service did not start, please check system/service log for details error")
if runtime.GOOS == "linux" {
@@ -379,7 +379,7 @@ func initCLI() {
initLogging()
if doTasks([]task{{s.Stop, true}}) {
prog.resetDNS()
mainLog.Warn().Msg("Service stopped")
mainLog.Notice().Msg("Service stopped")
}
},
}
@@ -401,7 +401,7 @@ func initCLI() {
}
initLogging()
if doTasks([]task{{s.Restart, true}}) {
mainLog.Warn().Msg("Service restarted")
mainLog.Notice().Msg("Service restarted")
}
},
}
@@ -426,13 +426,13 @@ func initCLI() {
}
switch status {
case service.StatusUnknown:
mainLog.Warn().Msg("Unknown status")
mainLog.Notice().Msg("Unknown status")
os.Exit(2)
case service.StatusRunning:
mainLog.Warn().Msg("Service is running")
mainLog.Notice().Msg("Service is running")
os.Exit(0)
case service.StatusStopped:
mainLog.Warn().Msg("Service is stopped")
mainLog.Notice().Msg("Service is stopped")
os.Exit(1)
}
},
@@ -477,7 +477,7 @@ NOTE: Uninstalling will set DNS to values provided by DHCP.`,
if err := router.Cleanup(); err != nil {
mainLog.Warn().Err(err).Msg("could not cleanup router")
}
mainLog.Warn().Msg("Service uninstalled")
mainLog.Notice().Msg("Service uninstalled")
return
}
},
@@ -887,7 +887,7 @@ func selfCheckStatus(status service.Status) service.Status {
}
func unsupportedPlatformHelp(cmd *cobra.Command) {
cmd.PrintErrln("Unsupported or incorrectly chosen router platform. Please open an issue and provide all relevant information: https://github.com/Control-D-Inc/ctrld/issues/new")
mainLog.Error().Msg("Unsupported or incorrectly chosen router platform. Please open an issue and provide all relevant information: https://github.com/Control-D-Inc/ctrld/issues/new")
}
func userHomeDir() (string, error) {

1
cmd/ctrld/cli_router_linux.go
View File

@@ -46,6 +46,7 @@ func initRouterCLI() {
case router.DDWrt, router.Merlin, router.OpenWrt, router.Ubios:
default:
unsupportedPlatformHelp(cmd)
os.Exit(1)
}
exe, err := os.Executable()
if err != nil {

4
cmd/ctrld/main.go
View File

@@ -70,7 +70,7 @@ func initConsoleLogging() {
case verbose > 1:
zerolog.SetGlobalLevel(zerolog.DebugLevel)
default:
zerolog.SetGlobalLevel(zerolog.WarnLevel)
zerolog.SetGlobalLevel(zerolog.NoticeLevel)
}
}
@@ -99,7 +99,7 @@ func initLogging() {
// TODO: find a better way.
ctrld.ProxyLog = mainLog
zerolog.SetGlobalLevel(zerolog.WarnLevel)
zerolog.SetGlobalLevel(zerolog.NoticeLevel)
logLevel := cfg.Service.LogLevel
switch {
case verbose == 1: