@@ -437,7 +437,14 @@ func (t *HookTask) AfterLoad() {
437
437
438
438
t .RequestInfo = & HookRequest {}
439
439
if err := json .Unmarshal ([]byte (t .RequestContent ), t .RequestInfo ); err != nil {
440
- log .Error (3 , "Unmarshal[%d]: %v" , t .ID , err )
440
+ log .Error (3 , "Unmarshal RequestContent[%d]: %v" , t .ID , err )
441
+ }
442
+
443
+ if len (t .ResponseContent ) > 0 {
444
+ t .ResponseInfo = & HookResponse {}
445
+ if err := json .Unmarshal ([]byte (t .ResponseContent ), t .ResponseInfo ); err != nil {
446
+ log .Error (3 , "Unmarshal ResponseContent[%d]: %v" , t .ID , err )
447
+ }
441
448
}
442
449
}
443
450
@@ -619,6 +626,10 @@ func (t *HookTask) deliver() {
619
626
log .Trace ("Hook delivery failed: %s" , t .UUID )
620
627
}
621
628
629
+ if err := UpdateHookTask (t ); err != nil {
630
+ log .Error (4 , "UpdateHookTask [%d]: %v" , t .ID , err )
631
+ }
632
+
622
633
// Update webhook last delivery status.
623
634
w , err := GetWebhookByID (t .HookID )
624
635
if err != nil {
@@ -671,10 +682,6 @@ func DeliverHooks() {
671
682
// Update hook task status.
672
683
for _ , t := range tasks {
673
684
t .deliver ()
674
-
675
- if err := UpdateHookTask (t ); err != nil {
676
- log .Error (4 , "UpdateHookTask [%d]: %v" , t .ID , err )
677
- }
678
685
}
679
686
680
687
// Start listening on new hook requests.
@@ -695,10 +702,6 @@ func DeliverHooks() {
695
702
}
696
703
for _ , t := range tasks {
697
704
t .deliver ()
698
- if err := UpdateHookTask (t ); err != nil {
699
- log .Error (4 , "UpdateHookTask [%d]: %v" , t .ID , err )
700
- continue
701
- }
702
705
}
703
706
}
704
707
}
0 commit comments