chore: 变更util与global层依赖关系

This commit is contained in:
Mmx
2021-11-25 08:37:53 +08:00
parent 884934b951
commit 66df79e68f
7 changed files with 20 additions and 16 deletions

View File

@@ -9,7 +9,7 @@ import (
)
func Guardian(output bool) {
global.Status.Output = output
util.Log.OutPut = output
go Daemon.DaemonChan()
@@ -19,12 +19,12 @@ func Guardian(output bool) {
var c = make(chan bool)
for {
global.Status.Output = output
util.Log.OutPut = output
go func() {
defer func() {
_ = recover()
}()
if !util.Checker.NetOk() {
if !util.Checker.NetOk(global.Config.Settings.Timeout) {
util.Log.Println("Network down, trying to login")
_ = Login(output, true)
} else {
@@ -40,7 +40,7 @@ func Guardian(output bool) {
}
func EnterGuardian() {
global.Status.Output = true
util.Log.OutPut = true
global.Status.Guardian = true
util.Log.Println("[Guardian mode]")
if global.Config.Settings.Daemon.Enable {

View File

@@ -10,11 +10,11 @@ import (
)
func Login(output bool, skipCheck bool) error {
global.Status.Output = output
util.Log.OutPut = output
G := global.Config.Generate()
if !skipCheck {
util.Log.Println("Step0: 检查状态…")
if util.Checker.NetOk() {
if util.Checker.NetOk(global.Config.Settings.Timeout) {
util.Log.Println("网络 ok")
return nil
}