New UI merge in progress

This commit is contained in:
Unknwon 2014-07-26 00:24:27 -04:00
parent 0a739cf9ac
commit 8dd07c0ddd
199 changed files with 15030 additions and 9325 deletions

View file

@ -47,7 +47,7 @@ type Webhook struct {
func (w *Webhook) GetEvent() {
w.HookEvent = &HookEvent{}
if err := json.Unmarshal([]byte(w.Events), w.HookEvent); err != nil {
log.Error("webhook.GetEvent(%d): %v", w.Id, err)
log.Error(4, "webhook.GetEvent(%d): %v", w.Id, err)
}
}
@ -193,13 +193,13 @@ func DeliverHooks() {
// Only support JSON now.
if _, err := httplib.Post(t.Url).SetTimeout(timeout, timeout).
Body([]byte(t.PayloadContent)).Response(); err != nil {
log.Error("webhook.DeliverHooks(Delivery): %v", err)
log.Error(4, "webhook.DeliverHooks(Delivery): %v", err)
return nil
}
t.IsDeliveried = true
if err := UpdateHookTask(t); err != nil {
log.Error("webhook.DeliverHooks(UpdateHookTask): %v", err)
log.Error(4, "webhook.DeliverHooks(UpdateHookTask): %v", err)
return nil
}