You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by jv...@apache.org on 2001/06/14 16:43:19 UTC
cvs commit: jakarta-turbine/src/java/org/apache/turbine/services/schedule TurbineNonPersistentSchedulerService.java TurbineSchedulerService.java WorkerThread.java
jvanzyl 01/06/14 07:43:19
Modified: src/java/org/apache/turbine/services/schedule
TurbineNonPersistentSchedulerService.java
TurbineSchedulerService.java WorkerThread.java
Log:
- updating service as per notes.
Revision Changes Path
1.8 +41 -47 jakarta-turbine/src/java/org/apache/turbine/services/schedule/TurbineNonPersistentSchedulerService.java
Index: TurbineNonPersistentSchedulerService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/schedule/TurbineNonPersistentSchedulerService.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- TurbineNonPersistentSchedulerService.java 2001/05/20 00:04:04 1.7
+++ TurbineNonPersistentSchedulerService.java 2001/06/14 14:43:18 1.8
@@ -56,11 +56,9 @@
import java.util.List;
import java.util.Vector;
-import javax.servlet.ServletConfig;
import org.apache.turbine.om.NumberKey;
import org.apache.turbine.om.ObjectKey;
-import org.apache.turbine.services.resources.TurbineResources;
-import org.apache.turbine.util.Log;
+import org.apache.turbine.services.InitializationException;
/**
* Service for a cron like scheduler that uses the
@@ -71,23 +69,25 @@
* An example is given below. The job names are the class names that
* extend ScheduledJob.
*
- *<PRE>
- scheduler.jobs=scheduledJobName,scheduledJobName2
-
- scheduler.job.scheduledJobName.ID=1
- scheduler.job.scheduledJobName.SECOND=-1
- scheduler.job.scheduledJobName.MINUTE=-1
- scheduler.job.scheduledJobName.HOUR=7
- scheduler.job.scheduledJobName.WEEKDAY=-1
- scheduler.job.scheduledJobName.DAY_OF_MONTH=-1
-
- scheduler.job.scheduledJobName2.ID=1
- scheduler.job.scheduledJobName2.SECOND=-1
- scheduler.job.scheduledJobName2.MINUTE=-1
- scheduler.job.scheduledJobName2.HOUR=7
- scheduler.job.scheduledJobName2.WEEKDAY=-1
- scheduler.job.scheduledJobName2.DAY_OF_MONTH=-1
- </PRE>
+ * <PRE>
+ *
+ * services.SchedulerService.scheduler.jobs=scheduledJobName,scheduledJobName2
+ *
+ * services.SchedulerService.scheduler.job.scheduledJobName.ID=1
+ * services.SchedulerService.scheduler.job.scheduledJobName.SECOND=-1
+ * services.SchedulerService.scheduler.job.scheduledJobName.MINUTE=-1
+ * services.SchedulerService.scheduler.job.scheduledJobName.HOUR=7
+ * services.SchedulerService.scheduler.job.scheduledJobName.WEEKDAY=-1
+ * services.SchedulerService.scheduler.job.scheduledJobName.DAY_OF_MONTH=-1
+ *
+ * services.SchedulerService.scheduler.job.scheduledJobName2.ID=1
+ * services.SchedulerService.scheduler.job.scheduledJobName2.SECOND=-1
+ * services.SchedulerService.scheduler.job.scheduledJobName2.MINUTE=-1
+ * services.SchedulerService.scheduler.job.scheduledJobName2.HOUR=7
+ * services.SchedulerService.scheduler.job.scheduledJobName2.WEEKDAY=-1
+ * services.SchedulerService.scheduler.job.scheduledJobName2.DAY_OF_MONTH=-1
+ *
+ * </PRE>
*
* Based on TamboraSchedulerService written by John Thorhauer.
*
@@ -114,24 +114,16 @@
* Load all the jobs from cold storage. Add jobs to the queue
* (sorted in ascending order by runtime) and start the scheduler
* thread.
- *
- * @param config A ServletConfig.
*/
- public void init(ServletConfig config)
+ public void init()
+ throws InitializationException
{
- if ( getInit() )
- {
- return;
- }
-
try
{
- org.apache.turbine.util.Log.info ( "TurbineNonPersistentSchedulerService init()....starting!");
-
scheduleQueue = new JobQueue();
mainLoop = new MainLoop();
- Vector jobProps = TurbineResources.getVector("scheduler.jobs");
+ Vector jobProps = getConfiguration().getVector("scheduler.jobs");
Vector jobs = new Vector();
// If there are scheduler.jobs defined then set up a job vector
// for the scheduleQueue
@@ -142,25 +134,27 @@
String jobName = (String)jobProps.elementAt(i);
String jobPrefix = "scheduler.job." + jobName ;
- if ( (TurbineResources.getString(jobPrefix + ".ID", null)) == null)
+ if ( (getConfiguration().getString(jobPrefix + ".ID", null)) == null)
{
throw new Exception(
"There is an error in the TurbineResources.properties file. \n" +
jobPrefix + ".ID is not found.\n");
}
- int sec = TurbineResources.getInt(jobPrefix + ".SECOND", -1);
- int min = TurbineResources.getInt(jobPrefix + ".MINUTE", -1);
- int hr = TurbineResources.getInt(jobPrefix + ".HOUR", -1);
- int wkday = TurbineResources.getInt(jobPrefix + ".WEEKDAY", -1);
- int dayOfMonth = TurbineResources.getInt(jobPrefix + ".DAY_OF_MONTH", -1);
-
- JobEntry je = new JobEntry(sec,
- min,
- hr,
- wkday,
- dayOfMonth,
- jobName);
+ int sec = getConfiguration().getInt(jobPrefix + ".SECOND", -1);
+ int min = getConfiguration().getInt(jobPrefix + ".MINUTE", -1);
+ int hr = getConfiguration().getInt(jobPrefix + ".HOUR", -1);
+ int wkday = getConfiguration().getInt(jobPrefix + ".WEEKDAY", -1);
+ int dayOfMonth = getConfiguration().getInt(jobPrefix + ".DAY_OF_MONTH", -1);
+
+ JobEntry je = new JobEntry(
+ sec,
+ min,
+ hr,
+ wkday,
+ dayOfMonth,
+ jobName);
+
jobs.addElement(je);
}
@@ -173,11 +167,11 @@
}
setInit(true);
- org.apache.turbine.util.Log.info ( "TurbineNonPersistentSchedulerService init()....finished!");
}
catch (Exception e)
{
- org.apache.turbine.util.Log.error ( "Cannot initialize TurbineNonPersistentSchedulerService!: " + e );
+ getCategory().error (
+ "Cannot initialize TurbineNonPersistentSchedulerService!: ", e);
}
}
@@ -245,7 +239,7 @@
catch(Exception e)
{
// Log problems.
- org.apache.turbine.util.Log.error ( "Problem updating Scheduled Job: " + e);
+ getCategory().error ( "Problem updating Scheduled Job: " + e);
}
// Update the queue.
scheduleQueue.modify(je);
1.17 +14 -15 jakarta-turbine/src/java/org/apache/turbine/services/schedule/TurbineSchedulerService.java
Index: TurbineSchedulerService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/schedule/TurbineSchedulerService.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- TurbineSchedulerService.java 2001/05/05 14:43:59 1.16
+++ TurbineSchedulerService.java 2001/06/14 14:43:18 1.17
@@ -56,21 +56,18 @@
import java.util.List;
import java.util.Vector;
-import javax.servlet.ServletConfig;
+import org.apache.turbine.services.BaseService;
import org.apache.turbine.services.InitializationException;
-import org.apache.turbine.services.TurbineBaseService;
-import org.apache.turbine.services.resources.TurbineResources;
-import org.apache.turbine.util.Log;
import org.apache.turbine.util.db.Criteria;
/**
* Service for a cron like scheduler.
*
* @author <a href="mailto:mbryson@mont.mindspring.com">Dave Bryson</a>
- * @version $Id: TurbineSchedulerService.java,v 1.16 2001/05/05 14:43:59 jvanzyl Exp $
+ * @version $Id: TurbineSchedulerService.java,v 1.17 2001/06/14 14:43:18 jvanzyl Exp $
*/
public class TurbineSchedulerService
- extends TurbineBaseService
+ extends BaseService
implements ScheduleService
{
/**
@@ -106,13 +103,13 @@
*
* @param config A ServletConfig.
*/
- public void init(ServletConfig config)
+ public void init()
throws InitializationException
{
try
{
// START SCHEDULER HERE
- if ( TurbineResources.getBoolean("scheduler.enabled", false) )
+ if ( getConfiguration().getBoolean("scheduler.enabled", false) )
{
scheduleQueue = new JobQueue();
mainLoop = new MainLoop();
@@ -130,13 +127,15 @@
}
else
{
- org.apache.turbine.util.Log.info ("TurbineSchedulerService was not started " +
- "because scheduler.enabled is not 'true' in the TurbineResources.properties file.");
+ getCategory().info ("TurbineSchedulerService was not started " +
+ "because scheduler.enabled is not 'true' in the " +
+ "TurbineResources.properties file.");
}
}
catch (Exception e)
{
- throw new InitializationException("TurbineSchedulerService failed to initialize", e);
+ throw new InitializationException(
+ "TurbineSchedulerService failed to initialize", e);
}
}
@@ -184,7 +183,7 @@
catch(Exception e)
{
// Log problems.
- org.apache.turbine.util.Log.error ( "Problem saving new Scheduled Job: " + e);
+ getCategory().error ( "Problem saving new Scheduled Job: " + e);
}
// Add to the queue.
scheduleQueue.add(je);
@@ -211,7 +210,7 @@
catch(Exception ouch)
{
// Log problem.
- org.apache.turbine.util.Log.error ( "Problem removing Scheduled Job: " + ouch);
+ getCategory().error ( "Problem removing Scheduled Job: " + ouch);
}
// Remove from the queue.
@@ -236,7 +235,7 @@
catch(Exception e)
{
// Log problems.
- org.apache.turbine.util.Log.error ( "Problem updating Scheduled Job: " + e);
+ getCategory().error ( "Problem updating Scheduled Job: " + e);
}
// Update the queue.
scheduleQueue.modify(je);
@@ -384,7 +383,7 @@
catch(Exception e)
{
// Log error.
- org.apache.turbine.util.Log.error ( "Error running a Scheduled Job: " + e);
+ getCategory().error ( "Error running a Scheduled Job: " + e);
}
finally
{
1.20 +8 -6 jakarta-turbine/src/java/org/apache/turbine/services/schedule/WorkerThread.java
Index: WorkerThread.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/schedule/WorkerThread.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- WorkerThread.java 2001/05/05 14:43:59 1.19
+++ WorkerThread.java 2001/06/14 14:43:18 1.20
@@ -56,15 +56,14 @@
import org.apache.turbine.TurbineConstants;
import org.apache.turbine.modules.ScheduledJobLoader;
-import org.apache.turbine.services.logging.Logger;
-import org.apache.turbine.services.logging.TurbineLogging;
+import org.apache.turbine.util.Log;
/**
* Wrapper for a <code>JobEntry</code> to actually perform the job's action.
*
* @author <a href="mailto:mbryson@mont.mindspring.com">Dave Bryson</a>
* @author <a href="mailto:dlr@finemaltcoding.com">Daniel Rall</a>
- * @version $Id: WorkerThread.java,v 1.19 2001/05/05 14:43:59 jvanzyl Exp $
+ * @version $Id: WorkerThread.java,v 1.20 2001/06/14 14:43:18 jvanzyl Exp $
*/
public class WorkerThread
implements Runnable
@@ -77,7 +76,7 @@
/**
* The {@link org.apache.turbine.services.logging.Logger} facility to use.
*/
- private Logger logger = null;
+ //private Logger logger = null;
/**
* Creates a new worker to run the specified <code>JobEntry</code>.
@@ -87,8 +86,11 @@
public WorkerThread(JobEntry je)
{
this.je = je;
+
+ /*
logger = TurbineLogging.getLogger
(TurbineConstants.SCHEDULER_LOG_FACILITY);
+ */
}
/**
@@ -110,7 +112,7 @@
}
catch (Exception e)
{
- logger.error("Error in WorkerThread for sheduled job #" +
+ Log.error("Error in WorkerThread for sheduled job #" +
je.getPrimaryKey() + ", task: " + je.getTask(), e);
}
finally
@@ -130,7 +132,7 @@
*/
private final void logStateChange(String state)
{
- logger.debug("Scheduled job #" + je.getPrimaryKey() + ' ' + state +
+ Log.debug("Scheduled job #" + je.getPrimaryKey() + ' ' + state +
", task: " + je.getTask());
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org