summaryrefslogtreecommitdiffstats
path: root/routers/private
diff options
context:
space:
mode:
authorzeripath <art27@cantab.net>2020-01-29 01:01:06 +0000
committerGitHub <noreply@github.com>2020-01-28 20:01:06 -0500
commitc01221e70fc71f5bcff5f699095fbcbfc1e2b4a3 (patch)
tree4017848a786da2080e9a003a77bd40bd81625680 /routers/private
parent7c84dbca4f0f79dc90752105800a6964693283bd (diff)
downloadgitea-c01221e70fc71f5bcff5f699095fbcbfc1e2b4a3.tar.gz
gitea-c01221e70fc71f5bcff5f699095fbcbfc1e2b4a3.zip
Queue: Make WorkerPools and Queues flushable (#10001)
* Make WorkerPools and Queues flushable Adds Flush methods to Queues and the WorkerPool Further abstracts the WorkerPool Adds a final step to Flush the queues in the defer from PrintCurrentTest Fixes an issue with Settings inheritance in queues Signed-off-by: Andrew Thornton <art27@cantab.net> * Change to for loop * Add IsEmpty and begin just making the queues composed WorkerPools * subsume workerpool into the queues and create a flushable interface * Add manager command * Move flushall to queue.Manager and add to testlogger * As per @guillep2k * as per @guillep2k * Just make queues all implement flushable and clean up the wrapped queue flushes * cope with no timeout Co-authored-by: Lauris BH <lauris@nix.lv>
Diffstat (limited to 'routers/private')
-rw-r--r--routers/private/internal.go4
-rw-r--r--routers/private/manager.go41
-rw-r--r--routers/private/manager_unix.go28
-rw-r--r--routers/private/manager_windows.go28
4 files changed, 101 insertions, 0 deletions
diff --git a/routers/private/internal.go b/routers/private/internal.go
index 913a52e404..b68a96c641 100644
--- a/routers/private/internal.go
+++ b/routers/private/internal.go
@@ -89,5 +89,9 @@ func RegisterRoutes(m *macaron.Macaron) {
m.Post("/hook/set-default-branch/:owner/:repo/:branch", SetDefaultBranch)
m.Get("/serv/none/:keyid", ServNoCommand)
m.Get("/serv/command/:keyid/:owner/:repo", ServCommand)
+ m.Post("/manager/shutdown", Shutdown)
+ m.Post("/manager/restart", Restart)
+ m.Post("/manager/flush-queues", bind(private.FlushOptions{}), FlushQueues)
+
}, CheckInternalToken)
}
diff --git a/routers/private/manager.go b/routers/private/manager.go
new file mode 100644
index 0000000000..1238ff2d28
--- /dev/null
+++ b/routers/private/manager.go
@@ -0,0 +1,41 @@
+// Copyright 2020 The Gitea Authors. All rights reserved.
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
+
+package private
+
+import (
+ "net/http"
+
+ "code.gitea.io/gitea/modules/graceful"
+ "code.gitea.io/gitea/modules/log"
+ "code.gitea.io/gitea/modules/private"
+ "code.gitea.io/gitea/modules/queue"
+
+ "gitea.com/macaron/macaron"
+)
+
+// FlushQueues flushes all the Queues
+func FlushQueues(ctx *macaron.Context, opts private.FlushOptions) {
+ if opts.NonBlocking {
+ // Save the hammer ctx here - as a new one is created each time you call this.
+ baseCtx := graceful.GetManager().HammerContext()
+ go func() {
+ err := queue.GetManager().FlushAll(baseCtx, opts.Timeout)
+ if err != nil {
+ log.Error("Flushing request timed-out with error: %v", err)
+ }
+ }()
+ ctx.JSON(http.StatusAccepted, map[string]interface{}{
+ "err": "Flushing",
+ })
+ return
+ }
+ err := queue.GetManager().FlushAll(ctx.Req.Request.Context(), opts.Timeout)
+ if err != nil {
+ ctx.JSON(http.StatusRequestTimeout, map[string]interface{}{
+ "err": err,
+ })
+ }
+ ctx.PlainText(http.StatusOK, []byte("success"))
+}
diff --git a/routers/private/manager_unix.go b/routers/private/manager_unix.go
new file mode 100644
index 0000000000..ec5e976059
--- /dev/null
+++ b/routers/private/manager_unix.go
@@ -0,0 +1,28 @@
+// +build !windows
+
+// Copyright 2020 The Gitea Authors. All rights reserved.
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
+
+package private
+
+import (
+ "net/http"
+
+ "code.gitea.io/gitea/modules/graceful"
+
+ "gitea.com/macaron/macaron"
+)
+
+// Restart causes the server to perform a graceful restart
+func Restart(ctx *macaron.Context) {
+ graceful.GetManager().DoGracefulRestart()
+ ctx.PlainText(http.StatusOK, []byte("success"))
+
+}
+
+// Shutdown causes the server to perform a graceful shutdown
+func Shutdown(ctx *macaron.Context) {
+ graceful.GetManager().DoGracefulShutdown()
+ ctx.PlainText(http.StatusOK, []byte("success"))
+}
diff --git a/routers/private/manager_windows.go b/routers/private/manager_windows.go
new file mode 100644
index 0000000000..ac840a9d81
--- /dev/null
+++ b/routers/private/manager_windows.go
@@ -0,0 +1,28 @@
+// +build windows
+
+// Copyright 2020 The Gitea Authors. All rights reserved.
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
+
+package private
+
+import (
+ "net/http"
+
+ "code.gitea.io/gitea/modules/graceful"
+
+ "gitea.com/macaron/macaron"
+)
+
+// Restart is not implemented for Windows based servers as they can't fork
+func Restart(ctx *macaron.Context) {
+ ctx.JSON(http.StatusNotImplemented, map[string]interface{}{
+ "err": "windows servers cannot be gracefully restarted - shutdown and restart manually",
+ })
+}
+
+// Shutdown causes the server to perform a graceful shutdown
+func Shutdown(ctx *macaron.Context) {
+ graceful.GetManager().DoGracefulShutdown()
+ ctx.PlainText(http.StatusOK, []byte("success"))
+}