From d08f2e115c50d4b34d20f22742f59ea9c79f6aeb Mon Sep 17 00:00:00 2001 From: Mmx <1624045573@qq.com> Date: Thu, 2 Dec 2021 22:42:51 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20daemon=E9=98=BB=E5=A1=9E=E4=BB=8Einit?= =?UTF-8?q?=E7=A7=BB=E5=85=A5main?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- controllers/daemon.go | 6 ------ main.go | 8 ++++++-- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/controllers/daemon.go b/controllers/daemon.go index 9fb6e60..1e44d6f 100644 --- a/controllers/daemon.go +++ b/controllers/daemon.go @@ -20,12 +20,6 @@ var Daemon = daemon{ Path: global.Config.Settings.Daemon.Path, } -func init() { - if global.Flags.RunningDaemon { - Guardian(false) - } -} - // MarkDaemon 写入后台标记文件 func (a *daemon) MarkDaemon() error { return tool.File.Write(a.Path, []byte(a.Mark)) diff --git a/main.go b/main.go index 5a3b38b..b8e4927 100644 --- a/main.go +++ b/main.go @@ -9,9 +9,13 @@ import ( func main() { defer util.Log.CatchRecover() - if global.Config.Settings.Guardian.Enable { + if global.Flags.RunningDaemon { + //后台挂起模式中 + controllers.Guardian(false) + } else if global.Config.Settings.Guardian.Enable { + //进入守护模式流程 controllers.EnterGuardian() - } else if err := controllers.Login(true, false); err != nil { + } else if err := controllers.Login(true, false); err != nil { //单次登录模式 util.Log.Println("运行出错,状态异常") if global.Config.Settings.DemoMode { util.Log.Fatalln(err)