diff --git a/modules/cache/cache.go b/modules/cache/cache.go index cdd9179623..19be8d956b 100644 --- a/modules/cache/cache.go +++ b/modules/cache/cache.go @@ -48,8 +48,7 @@ func Init() error { } const ( - testCacheKey = "DefaultCache.TestKey" - SlowCacheThreshold = 100 * time.Microsecond + testCacheKey = "DefaultCache.TestKey" ) func Test() (time.Duration, error) { diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 4788ed1ad0..85da63ba37 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -3144,7 +3144,6 @@ config.cache_item_ttl = Cache item TTL config.cache_test = Test Cache config.cache_test_failed = Failed to probe the cache: %v. -config.cache_test_slow = Cache test successful, but response is slow: %s. config.cache_test_succeeded = Cache test successful, got a response in %s. config.session_config = Session configuration diff --git a/routers/web/admin/admin.go b/routers/web/admin/admin.go index 4ea62b0742..42a3d98d9f 100644 --- a/routers/web/admin/admin.go +++ b/routers/web/admin/admin.go @@ -233,11 +233,9 @@ func SelfCheck(ctx *context.Context) { ctx.Data["DatabaseCheckHasProblems"] = hasProblem } - elapsed, err := cache.Test() + _, err = cache.Test() if err != nil { ctx.Data["CacheError"] = err - } else if elapsed > cache.SlowCacheThreshold { - ctx.Data["CacheSlow"] = fmt.Sprint(elapsed) } ctx.HTML(http.StatusOK, tplSelfCheck) diff --git a/routers/web/admin/config.go b/routers/web/admin/config.go index c0eae0846b..95c3ab7a4a 100644 --- a/routers/web/admin/config.go +++ b/routers/web/admin/config.go @@ -50,11 +50,7 @@ func TestCache(ctx *context.Context) { if err != nil { ctx.Flash.Error(ctx.Tr("admin.config.cache_test_failed", err)) } else { - if elapsed > cache.SlowCacheThreshold { - ctx.Flash.Warning(ctx.Tr("admin.config.cache_test_slow", elapsed)) - } else { - ctx.Flash.Info(ctx.Tr("admin.config.cache_test_succeeded", elapsed)) - } + ctx.Flash.Info(ctx.Tr("admin.config.cache_test_succeeded", elapsed)) } ctx.Redirect(setting.AppSubURL + "/admin/config") diff --git a/templates/admin/self_check.tmpl b/templates/admin/self_check.tmpl index afcd4cd640..ddf6012b3c 100644 --- a/templates/admin/self_check.tmpl +++ b/templates/admin/self_check.tmpl @@ -32,9 +32,6 @@ {{if .CacheError}}
{{ctx.Locale.Tr "admin.config.cache_test_failed" .CacheError}}
{{end}} - {{if .CacheSlow}} -
{{ctx.Locale.Tr "admin.config.cache_test_slow" .CacheSlow}}
- {{end}} diff --git a/tests/integration/admin_config_test.go b/tests/integration/admin_config_test.go index 92faf7ef01..6b035c1adb 100644 --- a/tests/integration/admin_config_test.go +++ b/tests/integration/admin_config_test.go @@ -8,6 +8,7 @@ import ( "testing" "forgejo.org/modules/test" + app_context "forgejo.org/services/context" "forgejo.org/tests" "github.com/stretchr/testify/assert" @@ -21,3 +22,15 @@ func TestAdminConfig(t *testing.T) { resp := session.MakeRequest(t, req, http.StatusOK) assert.True(t, test.IsNormalPageCompleted(resp.Body.String())) } + +func TestAdminConfigCacheTest(t *testing.T) { + defer tests.PrepareTestEnv(t)() + + session := loginUser(t, "user1") + req := NewRequest(t, "POST", "/admin/config/test_cache") + session.MakeRequest(t, req, http.StatusSeeOther) + + flashCookie := session.GetCookie(app_context.CookieNameFlash) + assert.NotNil(t, flashCookie) + assert.Contains(t, flashCookie.Value, "info%3DCache%2Btest%2Bsuccessful%252C%2Bgot%2Ba%2Bresponse") +}