Refactor: dependency initialize order

pull/1040/head
HFO4 4 years ago
parent 2bd80764a4
commit 57d12cb2de

@ -23,18 +23,85 @@ func Init(path string) {
gin.SetMode(gin.ReleaseMode) gin.SetMode(gin.ReleaseMode)
} }
cache.Init() dependencies := []struct {
if conf.SystemConfig.Mode == "master" { mode string
model.Init() factory func()
task.Init() }{
cluster.Init() {
aria2.Init(false) "both",
email.Init() func() {
crontab.Init() cache.Init()
InitStatic() },
} else { },
slave.Init() {
"master",
func() {
model.Init()
},
},
{
"both",
func() {
task.Init()
},
},
{
"master",
func() {
cluster.Init()
},
},
{
"master",
func() {
aria2.Init(false)
},
},
{
"master",
func() {
email.Init()
},
},
{
"master",
func() {
crontab.Init()
},
},
{
"master",
func() {
InitStatic()
},
},
{
"slave",
func() {
slave.Init()
},
},
{
"both",
func() {
auth.Init()
},
},
}
for _, dependency := range dependencies {
switch dependency.mode {
case "master":
if conf.SystemConfig.Mode == "master" {
dependency.factory()
}
case "slave":
if conf.SystemConfig.Mode == "slave" {
dependency.factory()
}
default:
dependency.factory()
}
} }
auth.Init()
} }

@ -30,12 +30,16 @@ func GetSettingByName(name string) string {
if optionValue, ok := cache.Get(cacheKey); ok { if optionValue, ok := cache.Get(cacheKey); ok {
return optionValue.(string) return optionValue.(string)
} }
// 尝试数据库中查找 // 尝试数据库中查找
result := DB.Where("name = ?", name).First(&setting) if DB != nil {
if result.Error == nil { result := DB.Where("name = ?", name).First(&setting)
_ = cache.Set(cacheKey, setting.Value, -1) if result.Error == nil {
return setting.Value _ = cache.Set(cacheKey, setting.Value, -1)
return setting.Value
}
} }
return "" return ""
} }

@ -65,7 +65,7 @@ func (d Driver) Put(ctx context.Context, file io.ReadCloser, dst string, size ui
return err return err
} }
res, err := d.client.Request("PUT", "tasktransfer", bytes.NewReader(body)). res, err := d.client.Request("PUT", "task/transfer", bytes.NewReader(body)).
CheckHTTPResponse(200). CheckHTTPResponse(200).
DecodeResponse() DecodeResponse()
if err != nil { if err != nil {

@ -59,5 +59,5 @@ func (job *TransferTask) GetError() *task.JobError {
// Do 开始执行任务 // Do 开始执行任务
func (job *TransferTask) Do() { func (job *TransferTask) Do() {
util.Log().Println("job", "") util.Log().Debug("job")
} }

Loading…
Cancel
Save