aboutsummaryrefslogtreecommitdiffstats
path: root/routers
diff options
context:
space:
mode:
authorzeripath <art27@cantab.net>2020-10-24 00:46:35 +0100
committerGitHub <noreply@github.com>2020-10-23 19:46:35 -0400
commitf40a2a4404e3eabf5e28ae43e1f395bb13176307 (patch)
treee4c0ece7b11704eba0e9e60cb10158dbb5399db8 /routers
parent9b11c3e32037a77e53551127d26dbf54139aa2fc (diff)
downloadgitea-f40a2a4404e3eabf5e28ae43e1f395bb13176307.tar.gz
gitea-f40a2a4404e3eabf5e28ae43e1f395bb13176307.zip
Store task errors following migrations and display them (#13246)
* Store task errors following migrations and display them When migrate tasks fail store the error in the task table and ensure that they show on the status page. Fix #13242 Signed-off-by: Andrew Thornton <art27@cantab.net> * Update web_src/js/index.js * Hide the failed first Signed-off-by: Andrew Thornton <art27@cantab.net> Co-authored-by: techknowlogick <techknowlogick@gitea.io>
Diffstat (limited to 'routers')
-rw-r--r--routers/repo/repo.go16
-rw-r--r--routers/routes/routes.go3
-rw-r--r--routers/user/task.go30
3 files changed, 31 insertions, 18 deletions
diff --git a/routers/repo/repo.go b/routers/repo/repo.go
index 742c952f6e..4220750328 100644
--- a/routers/repo/repo.go
+++ b/routers/repo/repo.go
@@ -402,19 +402,3 @@ func Download(ctx *context.Context) {
ctx.ServeFile(archivePath, ctx.Repo.Repository.Name+"-"+refName+ext)
}
-
-// Status returns repository's status
-func Status(ctx *context.Context) {
- task, err := models.GetMigratingTask(ctx.Repo.Repository.ID)
- if err != nil {
- ctx.JSON(500, map[string]interface{}{
- "err": err,
- })
- return
- }
-
- ctx.JSON(200, map[string]interface{}{
- "status": ctx.Repo.Repository.Status,
- "err": task.Errors,
- })
-}
diff --git a/routers/routes/routes.go b/routers/routes/routes.go
index 7f43b3b2b1..f123613b1f 100644
--- a/routers/routes/routes.go
+++ b/routers/routes/routes.go
@@ -490,6 +490,7 @@ func RegisterRoutes(m *macaron.Macaron) {
m.Get("/forgot_password", user.ForgotPasswd)
m.Post("/forgot_password", user.ForgotPasswdPost)
m.Post("/logout", user.SignOut)
+ m.Get("/task/:task", user.TaskStatus)
})
// ***** END: User *****
@@ -997,8 +998,6 @@ func RegisterRoutes(m *macaron.Macaron) {
m.Get("/archive/*", repo.MustBeNotEmpty, reqRepoCodeReader, repo.Download)
- m.Get("/status", reqRepoCodeReader, repo.Status)
-
m.Group("/branches", func() {
m.Get("", repo.Branches)
}, repo.MustBeNotEmpty, context.RepoRef(), reqRepoCodeReader)
diff --git a/routers/user/task.go b/routers/user/task.go
new file mode 100644
index 0000000000..a88257ee50
--- /dev/null
+++ b/routers/user/task.go
@@ -0,0 +1,30 @@
+// 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 user
+
+import (
+ "code.gitea.io/gitea/models"
+ "code.gitea.io/gitea/modules/context"
+)
+
+// TaskStatus returns task's status
+func TaskStatus(ctx *context.Context) {
+ task, opts, err := models.GetMigratingTaskByID(ctx.ParamsInt64("task"), ctx.User.ID)
+ if err != nil {
+ ctx.JSON(500, map[string]interface{}{
+ "err": err,
+ })
+ return
+ }
+
+ ctx.JSON(200, map[string]interface{}{
+ "status": task.Status,
+ "err": task.Errors,
+ "repo-id": task.RepoID,
+ "repo-name": opts.RepoName,
+ "start": task.StartTime,
+ "end": task.EndTime,
+ })
+}