knguyen 2005/11/03 18:22:09 CET
Modified files:
core/src/java/org/jahia/services/search
JahiaSearchBaseService.java
Log:
- keed thread running
Revision Changes Path
1.25 +24 -20
jahia/core/src/java/org/jahia/services/search/JahiaSearchBaseService.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/java/org/jahia/services/search/JahiaSearchBaseService.java.diff?r1=1.24&r2=1.25&f=h
Index: JahiaSearchBaseService.java
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/java/org/jahia/services/search/JahiaSearchBaseService.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- JahiaSearchBaseService.java 3 Nov 2005 13:22:29 -0000 1.24
+++ JahiaSearchBaseService.java 3 Nov 2005 17:22:09 -0000 1.25
@@ -287,28 +287,32 @@
if ( sitesServ == null || !sitesServ.isStarted() ){
continue;
}
- Iterator jobs = IndexingJobTools.resolveIndexingJobs(
-
this.indJobMgr.getIndexingJobsAfter(this.getLastIndexingJobTime(),
- false)).iterator();
- while (jobs.hasNext()) {
- job = (IndexingJob) jobs.next();
- try {
- job.execute();
- this.setLastIndexingJobTime(job.getDate());
- /*
- ServicesRegistry.getInstance().getClusterService()
- .sendMessage(new SearchClusterMessage(job));
- */
- /*
- ServicesRegistry.getInstance()
-
.getJahiaSearchService().deleteIndexingJob(job.getId().intValue());
- */
- } catch (Throwable t) {
- logger.debug("Exception executing IndexationJob", t);
+ try {
+ Iterator jobs = IndexingJobTools.resolveIndexingJobs(
+
this.indJobMgr.getIndexingJobsAfter(this.getLastIndexingJobTime(),
+ false)).iterator();
+ while (jobs.hasNext()) {
+ job = (IndexingJob) jobs.next();
+ try {
+ job.execute();
+ this.setLastIndexingJobTime(job.getDate());
+ /*
+ ServicesRegistry.getInstance().getClusterService()
+ .sendMessage(new SearchClusterMessage(job));
+ */
+ /*
+ ServicesRegistry.getInstance()
+
.getJahiaSearchService().deleteIndexingJob(job.getId().intValue());
+ */
+ } catch (Throwable t) {
+ logger.debug("Exception executing IndexationJob", t);
+ }
}
+
this.serverPropMgr.setProperty(serverId,"lastIndexingJobTime",
+ String.valueOf(this.getLastIndexingJobTime()));
+ } catch ( Throwable t ){
+ logger.debug("Exception executing IndexationJob", t);
}
- this.serverPropMgr.setProperty(serverId,"lastIndexingJobTime",
- String.valueOf(this.getLastIndexingJobTime()));
/*
synchronized(indexingJobLock){
try {
