Skip to content

Commit 5201ded

Browse files
committed
fix: exit code
fixed #57
1 parent 275d948 commit 5201ded

2 files changed

Lines changed: 15 additions & 13 deletions

File tree

cmd/bitsrun/main.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,12 @@ func main() {
1717
login.Guardian(logger.WithField(keys.LogComponent, "guard"))
1818
} else {
1919
//执行单次流程
20-
_ = login.Login(login.Conf{
20+
err := login.Login(login.Conf{
2121
Logger: logger.WithField(keys.LogComponent, "login"),
2222
IsOnlineDetectLogDebugLevel: false,
2323
})
24+
if err != nil {
25+
logger.Fatalln("login failed with error:", err)
26+
}
2427
}
2528
}

internal/login/login.go

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -96,9 +96,8 @@ func Single(conf SingleConf) error {
9696
return backoff.NewInstance(func(ctx context.Context) error {
9797
return doLogin(conf)
9898
}, config.BackoffConfig).Run(context.TODO())
99-
} else {
100-
return doLogin(conf)
10199
}
100+
return doLogin(conf)
102101
}
103102

104103
func doLogin(conf SingleConf) error {
@@ -192,7 +191,7 @@ func doLogin(conf SingleConf) error {
192191
return err
193192
}
194193
}
195-
} else {
194+
} else if ip != nil {
196195
clientIp = *ip
197196
}
198197

@@ -215,18 +214,18 @@ func doLogin(conf SingleConf) error {
215214
}
216215

217216
return nil
218-
} else {
219-
logger.Infoln("检测到用户未登录,开始尝试登录...")
217+
}
220218

221-
if err = srunClient.DoLogin(loginIp); err != nil {
222-
return err
223-
}
219+
logger.Infoln("检测到用户未登录,开始尝试登录...")
224220

225-
logger.Infoln("登录成功~")
221+
if err = srunClient.DoLogin(loginIp); err != nil {
222+
return err
223+
}
226224

227-
if config.Settings.DDNS.Enable {
228-
_ = ddns(logger, clientIp, httpClient)
229-
}
225+
logger.Infoln("登录成功~")
226+
227+
if config.Settings.DDNS.Enable {
228+
_ = ddns(logger, clientIp, httpClient)
230229
}
231230

232231
return nil

0 commit comments

Comments
 (0)