Author: bpapez
Date: Wed Aug 22 15:12:34 2007
New Revision: 18228
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18228&repname=
=3Djahia
Log:
Fix and improve error handling for error 503 (Service temporarily unavailab=
le)
- reduce default page generation wait time from 30 minutes to 2 minutes
- replace Jahia with Service in the error message
Modified:
trunk/core/src/conf/java/JahiaEnginesResources.properties
trunk/core/src/conf/java/JahiaEnginesResources_de.properties
trunk/core/src/conf/java/JahiaEnginesResources_en.properties
trunk/core/src/conf/java/JahiaMessageResources.properties
trunk/core/src/conf/java/JahiaMessageResources_de.properties
trunk/core/src/conf/java/JahiaMessageResources_en.properties
trunk/core/src/java/org/jahia/settings/SettingsBean.java
trunk/core/src/webapp/WEB-INF/etc/config/jahia.skeleton
Modified: trunk/core/src/conf/java/JahiaEnginesResources.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/conf/j=
ava/JahiaEnginesResources.properties&rev=3D18228&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/conf/java/JahiaEnginesResources.properties (original)
+++ trunk/core/src/conf/java/JahiaEnginesResources.properties Wed Aug 22 15=
:12:34 2007
@@ -570,7 +570,7 @@
org.jahia.bin.JahiaErrorDisplay.retryInTime.label =3D Please try again in =
{0,choice,0#|1#1 hour |1<{0,number,integer} hours }{1,choice,0#|1#1 minute =
|1<{1,number,integer} minutes }{2,choice,0#|1#1 second|1<{2,number,integer}=
seconds}.
org.jahia.bin.JahiaErrorDisplay.retryLater.label =3D Please try again late=
r.
org.jahia.bin.JahiaErrorDisplay.returnToJahia.label =3D Click here to retu=
rn to Jahia
-org.jahia.bin.JahiaErrorDisplay.serviceUnavailable.label =3D Jahia is temp=
orarily not available.
+org.jahia.bin.JahiaErrorDisplay.serviceUnavailable.label =3D Service is te=
mporarily not available.
org.jahia.bin.JahiaErrorDisplay.viewSource1part.label =3D If this error oc=
curs again, please
org.jahia.bin.JahiaErrorDisplay.viewSource2part.label =3D click here to vi=
ew the html source
org.jahia.bin.JahiaErrorDisplay.viewSource3part.label =3D You should then =
find the detail of the error (stack trace). Copy it and send it to your sit=
e manager so that he can solve the problem. Sorry for the inconvenience
Modified: trunk/core/src/conf/java/JahiaEnginesResources_de.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/conf/j=
ava/JahiaEnginesResources_de.properties&rev=3D18228&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/conf/java/JahiaEnginesResources_de.properties (original)
+++ trunk/core/src/conf/java/JahiaEnginesResources_de.properties Wed Aug 22=
15:12:34 2007
@@ -93,7 +93,7 @@
org.jahia.bin.JahiaErrorDisplay.retryInTime.label =3D Bitte versuchen sie =
es in {0,choice,0#|1#1 Stunde |1<{0,number,integer} Stunden }{1,choice,0#|1=
#1 Minute |1<{1,number,integer} Minuten }{2,choice,0#|1#1 Sekunde|1<{2,numb=
er,integer} Sekunden} wieder.
org.jahia.bin.JahiaErrorDisplay.retryLater.label =3D Bitte versuchen sie e=
s zu einem sp\u00E4teren Zeitpunkt wieder.
org.jahia.bin.JahiaErrorDisplay.returnToJahia.label =3D Klicken Sie hier, =
um zu Jahia zur\u00FCckzukehren.
-org.jahia.bin.JahiaErrorDisplay.serviceUnavailable.label =3D Jahia ist vor=
=C3=BCbergehend nicht verf\u00FCgbar. =
+org.jahia.bin.JahiaErrorDisplay.serviceUnavailable.label =3D Das Service i=
st vor=C3=BCbergehend nicht verf\u00FCgbar. =
org.jahia.bin.JahiaErrorDisplay.viewSource1part.label =3D Sollte dieser Fe=
hler noch einmal auftreten,
org.jahia.bin.JahiaErrorDisplay.viewSource2part.label =3D klicken Sie hier=
, um den HTML-Quellcode anzuzeigen.
org.jahia.bin.JahiaErrorDisplay.viewSource3part.label =3D Sie sollten dann=
den Fehler erkennen k\u00F6nnen (Stack Trace). Kopieren Sie den Fehler und=
senden Sie ihn an den Administrator, damit dieser das Problem beheben kann=
. Wir bitten um Ihr Verst\u00E4ndnis.
Modified: trunk/core/src/conf/java/JahiaEnginesResources_en.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/conf/j=
ava/JahiaEnginesResources_en.properties&rev=3D18228&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/conf/java/JahiaEnginesResources_en.properties (original)
+++ trunk/core/src/conf/java/JahiaEnginesResources_en.properties Wed Aug 22=
15:12:34 2007
@@ -570,7 +570,7 @@
org.jahia.bin.JahiaErrorDisplay.retryInTime.label =3D Please try again in =
{0,choice,0#|1#1 hour |1<{0,number,integer} hours }{1,choice,0#|1#1 minute =
|1<{1,number,integer} minutes }{2,choice,0#|1#1 second|1<{2,number,integer}=
seconds}.
org.jahia.bin.JahiaErrorDisplay.retryLater.label =3D Please try again late=
r.
org.jahia.bin.JahiaErrorDisplay.returnToJahia.label =3D Click here to retu=
rn to Jahia
-org.jahia.bin.JahiaErrorDisplay.serviceUnavailable.label =3D Jahia is temp=
orarily not available.
+org.jahia.bin.JahiaErrorDisplay.serviceUnavailable.label =3D Service is te=
mporarily not available.
org.jahia.bin.JahiaErrorDisplay.viewSource1part.label =3D If this error oc=
curs again, please
org.jahia.bin.JahiaErrorDisplay.viewSource2part.label =3D click here to vi=
ew the html source
org.jahia.bin.JahiaErrorDisplay.viewSource3part.label =3D You should then =
find the detail of the error (stack trace). Copy it and send it to your sit=
e manager so that he can solve the problem. Sorry for the inconvenience
Modified: trunk/core/src/conf/java/JahiaMessageResources.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/conf/j=
ava/JahiaMessageResources.properties&rev=3D18228&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/conf/java/JahiaMessageResources.properties (original)
+++ trunk/core/src/conf/java/JahiaMessageResources.properties Wed Aug 22 15=
:12:34 2007
@@ -202,7 +202,7 @@
org.jahia.bin.JahiaErrorDisplay.retryInTime.label =3D Please try again in =
{0,choice,0#|1#1 hour |1<{0,number,integer} hours }{1,choice,0#|1#1 minute =
|1<{1,number,integer} minutes }{2,choice,0#|1#1 second|1<{2,number,integer}=
seconds}.
org.jahia.bin.JahiaErrorDisplay.retryLater.label =3D Please try again late=
r.
org.jahia.bin.JahiaErrorDisplay.returnToJahia.label =3D Click here to retu=
rn to Jahia
-org.jahia.bin.JahiaErrorDisplay.serviceUnavailable.label =3D Jahia is temp=
orarily not available.
+org.jahia.bin.JahiaErrorDisplay.serviceUnavailable.label =3D Service is te=
mporarily not available.
org.jahia.bin.JahiaErrorDisplay.virtualSiteError.label =3D Virtual site er=
ror : Site not found.
org.jahia.bin.JahiaErrorDisplay.warningOccured.label =3D A warning has occ=
ured during processing. Please contact the <br> administrator if you get th=
is message repeatedly.
=
Modified: trunk/core/src/conf/java/JahiaMessageResources_de.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/conf/j=
ava/JahiaMessageResources_de.properties&rev=3D18228&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/conf/java/JahiaMessageResources_de.properties (original)
+++ trunk/core/src/conf/java/JahiaMessageResources_de.properties Wed Aug 22=
15:12:34 2007
@@ -201,7 +201,7 @@
org.jahia.bin.JahiaErrorDisplay.retryInTime.label =3D Bitte versuchen sie =
es in {0,choice,0#|1#1 Stunde |1<{0,number,integer} Stunden }{1,choice,0#|1=
#1 Minute |1<{1,number,integer} Minuten }{2,choice,0#|1#1 Sekunde|1<{2,numb=
er,integer} Sekunden} wieder.
org.jahia.bin.JahiaErrorDisplay.retryLater.label =3D Bitte versuchen sie e=
s zu einem sp\u00E4teren Zeitpunkt wieder.
org.jahia.bin.JahiaErrorDisplay.returnToJahia.label =3D Klicken Sie hier, =
um zu Jahia zur=C3=BCckzukehren.
-org.jahia.bin.JahiaErrorDisplay.serviceUnavailable.label =3D Jahia ist vor=
=C3=BCbergehend nicht verf\u00FCgbar.
+org.jahia.bin.JahiaErrorDisplay.serviceUnavailable.label =3D Das Service i=
st vor=C3=BCbergehend nicht verf\u00FCgbar.
org.jahia.bin.JahiaErrorDisplay.virtualSiteError.label =3D Fehler auf virt=
ueller Site: Die Site wurde nicht gefunden.
org.jahia.bin.JahiaErrorDisplay.warningOccured.label =3D Bei der Verarbeit=
ung wurde eine Warnmeldung ausgegeben. Kontaktieren Sie Ihren Administrator=
, wenn Sie diese Meldung h=C3=A4ufiger erhalten.
=
Modified: trunk/core/src/conf/java/JahiaMessageResources_en.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/conf/j=
ava/JahiaMessageResources_en.properties&rev=3D18228&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/conf/java/JahiaMessageResources_en.properties (original)
+++ trunk/core/src/conf/java/JahiaMessageResources_en.properties Wed Aug 22=
15:12:34 2007
@@ -204,7 +204,7 @@
org.jahia.bin.JahiaErrorDisplay.retryInTime.label =3D Please try again in =
{0,choice,0#|1#1 hour |1<{0,number,integer} hours }{1,choice,0#|1#1 minute =
|1<{1,number,integer} minutes }{2,choice,0#|1#1 second|1<{2,number,integer}=
seconds}.
org.jahia.bin.JahiaErrorDisplay.retryLater.label =3D Please try again late=
r.
org.jahia.bin.JahiaErrorDisplay.returnToJahia.label =3D Click here to retu=
rn to Jahia
-org.jahia.bin.JahiaErrorDisplay.serviceUnavailable.label =3D Jahia is temp=
orarily not available.
+org.jahia.bin.JahiaErrorDisplay.serviceUnavailable.label =3D Service is te=
mporarily not available.
org.jahia.bin.JahiaErrorDisplay.virtualSiteError.label =3D Virtual site er=
ror : Site not found.
org.jahia.bin.JahiaErrorDisplay.warningOccured.label =3D A warning has occ=
ured during processing. Please contact the <br> administrator if you get th=
is message repeatedly.
=
Modified: trunk/core/src/java/org/jahia/settings/SettingsBean.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/settings/SettingsBean.java&rev=3D18228&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/java/org/jahia/settings/SettingsBean.java (original)
+++ trunk/core/src/java/org/jahia/settings/SettingsBean.java Wed Aug 22 15:=
12:34 2007
@@ -373,7 +373,7 @@
=
// Core engine page generation queue configuration parameters
private int maxParallelProcessings =3D 10;
- private long pageGenerationWaitTime =3D 1800000; // in milliseconds =
+ private long pageGenerationWaitTime =3D 120000; // in milliseconds =
private long pageGenerationWaitTimeOnStartup =3D 0; // in milliseconds
private int suggestedRetryTimeAfterTimeout =3D 60; // in seconds
private int suggestedRetryTimeAfterTimeoutOnStartup =3D 10; // in seco=
nds
Modified: trunk/core/src/webapp/WEB-INF/etc/config/jahia.skeleton
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/WEB-INF/etc/config/jahia.skeleton&rev=3D18228&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/webapp/WEB-INF/etc/config/jahia.skeleton (original)
+++ trunk/core/src/webapp/WEB-INF/etc/config/jahia.skeleton Wed Aug 22 15:1=
2:34 2007
@@ -517,7 +517,7 @@
maxParallelProcessings =3D 10
# This variable controls how long threads are waiting to be able to start
# generating pages in heavy load situations (value in milliseconds)
-pageGenerationWaitTime =3D 1800000
+pageGenerationWaitTime =3D 120000
# This variable controls the setting of the HTTP Retry-After header, which=
is sent
# back to the client with a HTTP status code 503 (Service temporarily unav=
ailable). =
# It could be used also to trigger an automatic reload (value in seconds).
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
