Author: sshyrkov
Date: Wed Sep 26 12:33:24 2007
New Revision: 18666
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18666&repname=
=3Djahia
Log:
Clear scheduler shutdown:
1) Call scheduler shutdown with 'true' to wait for jobs to finish
2) Enable shutdown hook for Quartz
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/scheduler=
/SchedulerServiceImpl.java
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/WEB-INF/etc/config/quartz-=
ram.properties
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/WEB-INF/etc/config/quartz.=
properties
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/sch=
eduler/SchedulerServiceImpl.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/services/scheduler/SchedulerServiceImpl.jav=
a&rev=3D18666&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-5-0-SP-BRANCH/core/src/java/org/jahia/services/scheduler=
/SchedulerServiceImpl.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/services/scheduler=
/SchedulerServiceImpl.java Wed Sep 26 12:33:24 2007
@@ -68,9 +68,13 @@
*
* @return The unique service instance.
*/
- public synchronized static SchedulerServiceImpl getInstance() {
+ public static SchedulerServiceImpl getInstance() {
if (singletonInstance =3D=3D null) {
- singletonInstance =3D new SchedulerServiceImpl();
+ synchronized (SchedulerServiceImpl.class) {
+ if (singletonInstance =3D=3D null) {
+ singletonInstance =3D new SchedulerServiceImpl();
+ }
+ }
}
return singletonInstance;
}
@@ -252,17 +256,19 @@
}
=
public void stat() {
- try {
- List l =3D getAllJobsDetails();
- for (Iterator iterator =3D l.iterator(); iterator.hasNext();) {
- JobDetail jd =3D (JobDetail) iterator.next();
- JobDataMap data =3D jd.getJobDataMap();
- if (!jd.getJobDataMap().get("status").equals("successful")=
) {
- logger.debug(jd.getName() + " -> " + jd.getJobDataMap(=
).get("status"));
+ if (logger.isDebugEnabled()) {
+ try {
+ List l =3D getAllJobsDetails();
+ for (Iterator iterator =3D l.iterator(); iterator.hasNext(=
);) {
+ JobDetail jd =3D (JobDetail) iterator.next();
+ JobDataMap data =3D jd.getJobDataMap();
+ if (!data.get("status").equals("successful")) {
+ logger.debug(jd.getName() + " -> " + data.get("sta=
tus"));
+ }
}
+ } catch (JahiaException e) {
+ logger.error(e);
}
- } catch (JahiaException e) {
- logger.error(e);
}
}
=
@@ -271,8 +277,8 @@
try {
if (schedulerRunning) {
logger.debug("Shutting down scheduler...");
- scheduler.shutdown();
- ramscheduler.shutdown();
+ scheduler.shutdown(true);
+ ramscheduler.shutdown(true);
scheduler =3D null;
ramscheduler =3D null;
schedulerRunning =3D false;
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/WEB-INF/etc/config/q=
uartz-ram.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/WEB-INF/etc/config/quartz-ram.properties&rev=3D1866=
6&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-5-0-SP-BRANCH/core/src/webapp/WEB-INF/etc/config/quartz-=
ram.properties (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/WEB-INF/etc/config/quartz-=
ram.properties Wed Sep 26 12:33:24 2007
@@ -389,8 +389,8 @@
#org.quartz.plugin.jobInitializer.overWriteExistingJobs =3D false
#org.quartz.plugin.jobInitializer.failOnFileNotFound =3D true
=
-#org.quartz.plugin.shutdownhook.class =3D org.quartz.plugins.management.Sh=
utdownHookPlugin
-#org.quartz.plugin.shutdownhook.cleanShutdown =3D true
+org.quartz.plugin.shutdownhook.class =3D org.quartz.plugins.management.Shu=
tdownHookPlugin
+org.quartz.plugin.shutdownhook.cleanShutdown =3D true
=
=
=
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/WEB-INF/etc/config/q=
uartz.properties
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/WEB-INF/etc/config/quartz.properties&rev=3D18666&re=
pname=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-5-0-SP-BRANCH/core/src/webapp/WEB-INF/etc/config/quartz.=
properties (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/WEB-INF/etc/config/quartz.=
properties Wed Sep 26 12:33:24 2007
@@ -406,6 +406,6 @@
#org.quartz.plugin.jobInitializer.overWriteExistingJobs =3D false
#org.quartz.plugin.jobInitializer.failOnFileNotFound =3D true
=
-#org.quartz.plugin.shutdownhook.class =3D org.quartz.plugins.management.Sh=
utdownHookPlugin
-#org.quartz.plugin.shutdownhook.cleanShutdown =3D true
+org.quartz.plugin.shutdownhook.class =3D org.quartz.plugins.management.Shu=
tdownHookPlugin
+org.quartz.plugin.shutdownhook.cleanShutdown =3D true
=
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
