Author: sshyrkov
Date: Fri Nov 9 10:57:52 2007
New Revision: 19100
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D19100&repname=
=3Djahia
Log:
[trunk r19077] JAHIA-2589: Server overloaded: please catch exception
* do not display the stack-trace in the log, while it still displays a sing=
le-line warning (also an e-Mail to administrator is still sent)
Modified:
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/bin/JahiaActi=
on.java
branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/bin/JahiaAdmi=
nistration.java
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/bin/Jah=
iaAction.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/java/org/jahia/bin/JahiaAction.java&rev=3D19100&repna=
me=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
--- branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/bin/JahiaActi=
on.java (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/bin/JahiaActi=
on.java Fri Nov 9 10:57:52 2007
@@ -115,6 +115,7 @@
logger.debug("Server is overloaded exception : ", ex);
JahiaErrorDisplay.DisplayException(request, response,
servlet.getServletContext(), Jahia.getSettings(),
+ true, false,
ex); =
} catch ( Throwable t ){
logger.error("Error", JahiaErrorDisplay.getNestedException(t));
Modified: branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/bin/Jah=
iaAdministration.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-INCLUD=
E-TAG-BRANCH/core/src/java/org/jahia/bin/JahiaAdministration.java&rev=3D191=
00&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
--- branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/bin/JahiaAdmi=
nistration.java (original)
+++ branches/JAHIA-INCLUDE-TAG-BRANCH/core/src/java/org/jahia/bin/JahiaAdmi=
nistration.java Fri Nov 9 10:57:52 2007
@@ -1145,7 +1145,7 @@
// PAGE NOT FOUND EXCEPTION
} catch (JahiaPageNotFoundException ex) {
logger.debug (ex.getJahiaErrorMsg(), ex);
- JahiaErrorDisplay.DisplayException (request, response, getServ=
letContext(), jSettings, ex);
+ JahiaErrorDisplay.DisplayException (request, response, getServ=
letContext(), jSettings, false, false, ex);
}
// SECURITY EXCEPTION
catch (JahiaSecurityException ex) {
@@ -1161,7 +1161,7 @@
// SERVER OVERLOADED
catch (JahiaServerOverloadedException ex) {
logger.debug ("The server is overloaded -> request ignored.", =
ex);
- JahiaErrorDisplay.DisplayException (request, response, getServ=
letContext(), jSettings, ex);
+ JahiaErrorDisplay.DisplayException (request, response, getServ=
letContext(), jSettings, true, false, ex);
} =
=
// OPERATION NOT ALLOWED
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
