|
|
@ -103,9 +103,9 @@ type HookResponse struct {
|
|
|
|
|
|
|
|
|
|
|
|
// HookTask represents a hook task.
|
|
|
|
// HookTask represents a hook task.
|
|
|
|
type HookTask struct {
|
|
|
|
type HookTask struct {
|
|
|
|
ID int64 `xorm:"pk autoincr"`
|
|
|
|
ID int64 `xorm:"pk autoincr"`
|
|
|
|
HookID int64
|
|
|
|
HookID int64 `xorm:"index"`
|
|
|
|
UUID string
|
|
|
|
UUID string `xorm:"unique"`
|
|
|
|
api.Payloader `xorm:"-"`
|
|
|
|
api.Payloader `xorm:"-"`
|
|
|
|
PayloadContent string `xorm:"LONGTEXT"`
|
|
|
|
PayloadContent string `xorm:"LONGTEXT"`
|
|
|
|
EventType HookEventType
|
|
|
|
EventType HookEventType
|
|
|
@ -270,7 +270,7 @@ func CleanupHookTaskTable(ctx context.Context, cleanupType HookTaskCleanupType,
|
|
|
|
return db.ErrCancelledf("Before deleting hook_task records for hook id %d", hookID)
|
|
|
|
return db.ErrCancelledf("Before deleting hook_task records for hook id %d", hookID)
|
|
|
|
default:
|
|
|
|
default:
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if err = deleteDeliveredHookTasksByWebhook(hookID, numberToKeep); err != nil {
|
|
|
|
if err = deleteDeliveredHookTasksByWebhook(ctx, hookID, numberToKeep); err != nil {
|
|
|
|
return err
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -279,10 +279,10 @@ func CleanupHookTaskTable(ctx context.Context, cleanupType HookTaskCleanupType,
|
|
|
|
return nil
|
|
|
|
return nil
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
func deleteDeliveredHookTasksByWebhook(hookID int64, numberDeliveriesToKeep int) error {
|
|
|
|
func deleteDeliveredHookTasksByWebhook(ctx context.Context, hookID int64, numberDeliveriesToKeep int) error {
|
|
|
|
log.Trace("Deleting hook_task rows for webhook %d, keeping the most recent %d deliveries", hookID, numberDeliveriesToKeep)
|
|
|
|
log.Trace("Deleting hook_task rows for webhook %d, keeping the most recent %d deliveries", hookID, numberDeliveriesToKeep)
|
|
|
|
deliveryDates := make([]int64, 0, 10)
|
|
|
|
deliveryDates := make([]int64, 0, 10)
|
|
|
|
err := db.GetEngine(db.DefaultContext).Table("hook_task").
|
|
|
|
err := db.GetEngine(ctx).Table("hook_task").
|
|
|
|
Where("hook_task.hook_id = ? AND hook_task.is_delivered = ? AND hook_task.delivered is not null", hookID, true).
|
|
|
|
Where("hook_task.hook_id = ? AND hook_task.is_delivered = ? AND hook_task.delivered is not null", hookID, true).
|
|
|
|
Cols("hook_task.delivered").
|
|
|
|
Cols("hook_task.delivered").
|
|
|
|
Join("INNER", "webhook", "hook_task.hook_id = webhook.id").
|
|
|
|
Join("INNER", "webhook", "hook_task.hook_id = webhook.id").
|
|
|
@ -294,7 +294,7 @@ func deleteDeliveredHookTasksByWebhook(hookID int64, numberDeliveriesToKeep int)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if len(deliveryDates) > 0 {
|
|
|
|
if len(deliveryDates) > 0 {
|
|
|
|
deletes, err := db.GetEngine(db.DefaultContext).
|
|
|
|
deletes, err := db.GetEngine(ctx).
|
|
|
|
Where("hook_id = ? and is_delivered = ? and delivered <= ?", hookID, true, deliveryDates[0]).
|
|
|
|
Where("hook_id = ? and is_delivered = ? and delivered <= ?", hookID, true, deliveryDates[0]).
|
|
|
|
Delete(new(HookTask))
|
|
|
|
Delete(new(HookTask))
|
|
|
|
if err != nil {
|
|
|
|
if err != nil {
|
|
|
|