summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
Diffstat (limited to 'services')
-rw-r--r--services/cron/cron.go7
-rw-r--r--services/pull/check_test.go2
-rw-r--r--services/webhook/deliver.go11
3 files changed, 14 insertions, 6 deletions
diff --git a/services/cron/cron.go b/services/cron/cron.go
index 9fe90d4230..ebbcd75b6d 100644
--- a/services/cron/cron.go
+++ b/services/cron/cron.go
@@ -7,9 +7,11 @@ package cron
import (
"context"
+ "runtime/pprof"
"time"
"code.gitea.io/gitea/modules/graceful"
+ "code.gitea.io/gitea/modules/process"
"code.gitea.io/gitea/modules/sync"
"github.com/gogs/cron"
@@ -23,7 +25,9 @@ var taskStatusTable = sync.NewStatusTable()
// NewContext begins cron tasks
// Each cron task is run within the shutdown context as a running server
// AtShutdown the cron server is stopped
-func NewContext() {
+func NewContext(original context.Context) {
+ defer pprof.SetGoroutineLabels(original)
+ _, _, finished := process.GetManager().AddTypedContext(graceful.GetManager().ShutdownContext(), "Service: Cron", process.SystemProcessType, true)
initBasicTasks()
initExtendedTasks()
@@ -42,6 +46,7 @@ func NewContext() {
lock.Lock()
started = false
lock.Unlock()
+ finished()
})
}
diff --git a/services/pull/check_test.go b/services/pull/check_test.go
index 4cdd17cc7b..65bcb9c0e4 100644
--- a/services/pull/check_test.go
+++ b/services/pull/check_test.go
@@ -32,9 +32,9 @@ func TestPullRequest_AddToTaskQueue(t *testing.T) {
WorkerPoolConfiguration: queue.WorkerPoolConfiguration{
QueueLength: 10,
BatchLength: 1,
+ Name: "temporary-queue",
},
Workers: 1,
- Name: "temporary-queue",
}, "")
assert.NoError(t, err)
diff --git a/services/webhook/deliver.go b/services/webhook/deliver.go
index f45e9d08d8..7998be53c2 100644
--- a/services/webhook/deliver.go
+++ b/services/webhook/deliver.go
@@ -24,6 +24,7 @@ import (
"code.gitea.io/gitea/modules/graceful"
"code.gitea.io/gitea/modules/hostmatcher"
"code.gitea.io/gitea/modules/log"
+ "code.gitea.io/gitea/modules/process"
"code.gitea.io/gitea/modules/proxy"
"code.gitea.io/gitea/modules/setting"
@@ -31,7 +32,7 @@ import (
)
// Deliver deliver hook task
-func Deliver(t *webhook_model.HookTask) error {
+func Deliver(ctx context.Context, t *webhook_model.HookTask) error {
w, err := webhook_model.GetWebhookByID(t.HookID)
if err != nil {
return err
@@ -178,7 +179,7 @@ func Deliver(t *webhook_model.HookTask) error {
return nil
}
- resp, err := webhookHTTPClient.Do(req.WithContext(graceful.GetManager().ShutdownContext()))
+ resp, err := webhookHTTPClient.Do(req.WithContext(ctx))
if err != nil {
t.ResponseInfo.Body = fmt.Sprintf("Delivery: %v", err)
return err
@@ -210,6 +211,8 @@ func DeliverHooks(ctx context.Context) {
return
default:
}
+ ctx, _, finished := process.GetManager().AddTypedContext(ctx, "Service: DeliverHooks", process.SystemProcessType, true)
+ defer finished()
tasks, err := webhook_model.FindUndeliveredHookTasks()
if err != nil {
log.Error("DeliverHooks: %v", err)
@@ -223,7 +226,7 @@ func DeliverHooks(ctx context.Context) {
return
default:
}
- if err = Deliver(t); err != nil {
+ if err = Deliver(ctx, t); err != nil {
log.Error("deliver: %v", err)
}
}
@@ -255,7 +258,7 @@ func DeliverHooks(ctx context.Context) {
return
default:
}
- if err = Deliver(t); err != nil {
+ if err = Deliver(ctx, t); err != nil {
log.Error("deliver: %v", err)
}
}