@@ -494,7 +494,14 @@ func (t *HookTask) AfterLoad() {
494
494
495
495
t .RequestInfo = & HookRequest {}
496
496
if err := json .Unmarshal ([]byte (t .RequestContent ), t .RequestInfo ); err != nil {
497
- log .Error (3 , "Unmarshal[%d]: %v" , t .ID , err )
497
+ log .Error (3 , "Unmarshal RequestContent[%d]: %v" , t .ID , err )
498
+ }
499
+
500
+ if len (t .ResponseContent ) > 0 {
501
+ t .ResponseInfo = & HookResponse {}
502
+ if err := json .Unmarshal ([]byte (t .ResponseContent ), t .ResponseInfo ); err != nil {
503
+ log .Error (3 , "Unmarshal ResponseContent[%d]: %v" , t .ID , err )
504
+ }
498
505
}
499
506
}
500
507
@@ -665,6 +672,10 @@ func (t *HookTask) deliver() {
665
672
log .Trace ("Hook delivery failed: %s" , t .UUID )
666
673
}
667
674
675
+ if err := UpdateHookTask (t ); err != nil {
676
+ log .Error (4 , "UpdateHookTask [%d]: %v" , t .ID , err )
677
+ }
678
+
668
679
// Update webhook last delivery status.
669
680
w , err := GetWebhookByID (t .HookID )
670
681
if err != nil {
@@ -717,10 +728,6 @@ func DeliverHooks() {
717
728
// Update hook task status.
718
729
for _ , t := range tasks {
719
730
t .deliver ()
720
-
721
- if err := UpdateHookTask (t ); err != nil {
722
- log .Error (4 , "UpdateHookTask [%d]: %v" , t .ID , err )
723
- }
724
731
}
725
732
726
733
// Start listening on new hook requests.
@@ -741,10 +748,6 @@ func DeliverHooks() {
741
748
}
742
749
for _ , t := range tasks {
743
750
t .deliver ()
744
- if err := UpdateHookTask (t ); err != nil {
745
- log .Error (4 , "UpdateHookTask [%d]: %v" , t .ID , err )
746
- continue
747
- }
748
751
}
749
752
}
750
753
}
0 commit comments