Nulo/forgejo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix https://github.com/go-xorm/xorm/issues/161

Browse source
This commit is contained in:
Unknwon 2014-09-12 18:58:24 -04:00
parent cfed11f092
commit 1b7adf57e9
2 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
models/models.go
View file

@ -77,7 +77,7 @@ func getEngine() (*xorm.Engine, error) {
return nil, fmt.Errorf("Unknown database type: %s", DbCfg.Type)
}
os.MkdirAll(path.Dir(DbCfg.Path), os.ModePerm)
cnnstr = DbCfg.Path
cnnstr = "file:" + DbCfg.Path + "?cache=shared&mode=rwc"
default:
return nil, fmt.Errorf("Unknown database type: %s", DbCfg.Type)
}

17
models/webhook.go
View file

@ -236,6 +236,7 @@ func UpdateHookTask(t *HookTask) error {
// DeliverHooks checks and delivers undelivered hooks.
func DeliverHooks() {
tasks := make([]*HookTask, 0, 10)
timeout := time.Duration(setting.WebhookDeliverTimeout) * time.Second
x.Where("is_delivered=?", false).Iterate(new(HookTask),
func(idx int, bean interface{}) error {
@ -283,12 +284,18 @@ func DeliverHooks() {
}
}
if err := UpdateHookTask(t); err != nil {
log.Error(4, "UpdateHookTask: %v", err)
return nil
}
tasks = append(tasks, t)
log.Trace("Hook delivered(%s): %s", t.Uuid, t.PayloadContent)
if t.IsSucceed {
log.Trace("Hook delivered(%s): %s", t.Uuid, t.PayloadContent)
}
return nil
})
// Update hook task status.
for _, t := range tasks {
if err := UpdateHookTask(t); err != nil {
log.Error(4, "UpdateHookTask(%d): %v", t.Id, err)
}
}
}