* API: show admin 500 error message on PROD mode too * a nit * dont miss InternalServerError Co-authored-by: techknowlogick <techknowlogick@gitea.io>tags/v1.13.0-rc1
@@ -320,9 +320,9 @@ Please try upgrading to a lower version first (suggested v1.6.4), then upgrade t | |||||
return nil | return nil | ||||
} | } | ||||
// Downgraded Gitea not supported | |||||
// Downgrading Gitea's database version not supported | |||||
if int(v-minDBVersion) > len(migrations) { | if int(v-minDBVersion) > len(migrations) { | ||||
msg := fmt.Sprintf("Downgrading Gitea from '%d' to '%d' is not supported and may result in loss of data integrity.\nIf you really know what you're doing, execute `UPDATE version SET version=%d WHERE id=1;`\n", | |||||
msg := fmt.Sprintf("Downgrading database version from '%d' to '%d' is not supported and may result in loss of data integrity.\nIf you really know what you're doing, execute `UPDATE version SET version=%d WHERE id=1;`\n", | |||||
v, minDBVersion+len(migrations), minDBVersion+len(migrations)) | v, minDBVersion+len(migrations), minDBVersion+len(migrations)) | ||||
fmt.Fprint(os.Stderr, msg) | fmt.Fprint(os.Stderr, msg) | ||||
log.Fatal(msg) | log.Fatal(msg) | ||||
@@ -82,7 +82,7 @@ func (ctx *APIContext) Error(status int, title string, obj interface{}) { | |||||
if status == http.StatusInternalServerError { | if status == http.StatusInternalServerError { | ||||
log.ErrorWithSkip(1, "%s: %s", title, message) | log.ErrorWithSkip(1, "%s: %s", title, message) | ||||
if macaron.Env == macaron.PROD { | |||||
if macaron.Env == macaron.PROD && !(ctx.User != nil && ctx.User.IsAdmin) { | |||||
message = "" | message = "" | ||||
} | } | ||||
} | } | ||||
@@ -99,7 +99,7 @@ func (ctx *APIContext) InternalServerError(err error) { | |||||
log.ErrorWithSkip(1, "InternalServerError: %v", err) | log.ErrorWithSkip(1, "InternalServerError: %v", err) | ||||
var message string | var message string | ||||
if macaron.Env != macaron.PROD { | |||||
if macaron.Env != macaron.PROD || (ctx.User != nil && ctx.User.IsAdmin) { | |||||
message = err.Error() | message = err.Error() | ||||
} | } | ||||