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/cli: do not mask err argument of selfUninstall

Browse Source 
The err should be preserved, so if we passed the error around, other
functions could still check for utility error code correctly.
This commit is contained in:
Cuong Manh Le
2024-08-05 23:36:56 +07:00
committed by Cuong Manh Le
parent 30320ec9c7
commit 8b98faa441
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/cli/self_kill_unix.go
View File

@@ -14,15 +14,15 @@ import (
"github.com/rs/zerolog"
)
func selfUninstall(err error, p *prog, logger zerolog.Logger) {
func selfUninstall(uninstallErr error, p *prog, logger zerolog.Logger) {
var uer *controld.UtilityErrorResponse
if errors.As(err, &uer) && uer.ErrorField.Code == controld.InvalidConfigCode {
if errors.As(uninstallErr, &uer) && uer.ErrorField.Code == controld.InvalidConfigCode {
if runtime.GOOS == "linux" {
s, err := newService(p, svcConfig)
if err != nil {
logger.Warn().Err(err).Msg("failed to create new service")
} else {
selfUninstallLinux(err, p, logger)
selfUninstallLinux(uninstallErr, p, logger)
_ = s.Stop()
os.Exit(0)
}