diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/nucache.html b/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/nucache.html index 63f2e73c6c..ea811174ce 100644 --- a/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/nucache.html +++ b/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/nucache.html @@ -4,41 +4,51 @@ -

You are running the brand new NuCache!

- -

- NuCache is working. - NuCache says: {{vm.status}} -

- -

This lets you refresh the status, or collect snapshots (after running a CLR GC).

- -
- - -
- -
- -

- This lets you rebuild the database cache (status above), ie the content of the cmsContentNu table. - Rebuilding can be expensive. +

+ (wait) + {{vm.status}}

- +
-
+

Memory Cache

- This lets you reload the in-memory and local file cache by entirely reloading it from - the data in the cmsContentNu table, but it does not rebuild that table. This is relatively - fast. Triggers the reload on all servers in an LB environment. + This button lets you reload the in-memory cache, by entirely reloading it from the database + cache (but it does not rebuild that database cache). This is relatively fast. + Use it when you think that the memory cache has not been properly refreshed, after some events + triggered—which would indicate a minor Umbraco issue. + (note: triggers the reload on all servers in an LB environment).

+

Database Cache

+ +

+ This button lets you rebuild the database cache, ie the content of the cmsContentNu table. + Rebuilding can be expensive. + Use it when reloading is not enough, and you think that the database cache has not been + properly generated—which would indicate some critical Umbraco issue. +

+ +
+ +
+ +

Internals

+ +

+ This button lets you trigger a NuCache snapshots collection (after running a fullCLR GC). + Unless you know what that means, you probably do not need to use it. +

+ +
+ +
+ diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/publishedstatus.html b/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/publishedstatus.html index d939f55f71..458f1e5148 100644 --- a/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/publishedstatus.html +++ b/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/publishedstatus.html @@ -1,7 +1,7 @@ 
-

Published Status

+

Published Cache

diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml index b7a8196e92..5578747bc7 100644 --- a/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml +++ b/src/Umbraco.Web.UI/Umbraco/config/lang/da.xml @@ -1600,7 +1600,7 @@ Mange hilsner fra Umbraco robotten Indhold Velkommen Examine Management - Published Status + Published Cache Models Builder Health Check Kom godt i gang diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml index ab3a281114..88a628436f 100644 --- a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml +++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml @@ -2110,7 +2110,7 @@ To manage your website, simply open the Umbraco back office and start adding con Content Welcome Examine Management - Published Status + Published Cache Models Builder Health Check Getting Started diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml index 9c66d1bef8..507dde4d7c 100644 --- a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml +++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml @@ -2122,7 +2122,7 @@ To manage your website, simply open the Umbraco back office and start adding con Content Welcome Examine Management - Published Status + Published Cache Models Builder Health Check Getting Started diff --git a/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs b/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs index 9c5587fbd5..d34a789581 100755 --- a/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs +++ b/src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs @@ -1614,14 +1614,14 @@ AND cmsContentNu.nodeId IS NULL var ce = _contentStore.Count; var me = _mediaStore.Count; - return "I'm feeling good, really." + + return " Database cache is " + (dbCacheIsOk ? "ok" : "NOT ok (rebuild?)") + "." + - " ContentStore has " + cg + " generation" + (cg > 1 ? "s" : "") + - ", " + cs + " snapshot" + (cs > 1 ? "s" : "") + - " and " + ce + " entr" + (ce > 1 ? "ies" : "y") + "." + - " MediaStore has " + mg + " generation" + (mg > 1 ? "s" : "") + - ", " + ms + " snapshot" + (ms > 1 ? "s" : "") + - " and " + me + " entr" + (me > 1 ? "ies" : "y") + "."; + " ContentStore contains " + ce + " item" + (ce > 1 ? "s" : "") + + " and has " + cg + " generation" + (cg > 1 ? "s" : "") + + " and " + cs + " snapshot" + (cs > 1 ? "s" : "") + "." + + " MediaStore contains " + me + " item" + (ce > 1 ? "s" : "") + + " and has " + mg + " generation" + (mg > 1 ? "s" : "") + + " and " + ms + " snapshot" + (ms > 1 ? "s" : "") + "."; } public void Collect()