From 3968c1149ea84506552a0c343f3be8eab2fcfc18 Mon Sep 17 00:00:00 2001 From: Ethan Koenig Date: Sun, 28 Jan 2018 17:26:01 -0700 Subject: [PATCH] Fix SQL type error for webhooks (#3424) --- models/webhook.go | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/models/webhook.go b/models/webhook.go index 3e3f5fc3fd..b18b9e35a3 100644 --- a/models/webhook.go +++ b/models/webhook.go @@ -20,6 +20,7 @@ import ( "code.gitea.io/gitea/modules/util" api "code.gitea.io/sdk/gitea" + "github.com/Unknwon/com" gouuid "github.com/satori/go.uuid" ) @@ -677,9 +678,15 @@ func DeliverHooks() { } // Start listening on new hook requests. - for repoID := range HookQueue.Queue() { - log.Trace("DeliverHooks [repo_id: %v]", repoID) - HookQueue.Remove(repoID) + for repoIDStr := range HookQueue.Queue() { + log.Trace("DeliverHooks [repo_id: %v]", repoIDStr) + HookQueue.Remove(repoIDStr) + + repoID, err := com.StrTo(repoIDStr).Int64() + if err != nil { + log.Error(4, "Invalid repo ID: %s", repoIDStr) + continue + } tasks = make([]*HookTask, 0, 5) if err := x.Where("repo_id=? AND is_delivered=?", repoID, false).Find(&tasks); err != nil {