[frontierkernel-commits] odbs/frontierRoot/system/verbs/builtins/scheduler init,1.1.1.1,1.2

[creedon <icr...@us...>]

Update of /cvsroot/frontierkernel/odbs/frontierRoot/system/verbs/builtins/scheduler
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24478

Modified Files:
	init 
Log Message:
confirmStartupTasks is now false by default, so as not to mess up frontier as a server; initializations moved from system.startup.startupScript

Index: init
===================================================================
RCS file: /cvsroot/frontierkernel/odbs/frontierRoot/system/verbs/builtins/scheduler/init,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** init	26 Mar 2005 19:43:27 -0000	1.1.1.1
--- init	13 Jun 2005 19:45:41 -0000	1.2
***************
*** 1,3 ****
  FrontierVcsFile:1:scpt:system.verbs.builtins.scheduler.init
  
! ÇChanges:
	Ç06/24/00; 1:23:36 AM by PBS
		ÇLogging is off by default.

if not defined (user.scheduler) {
	new (tabletype, @user.scheduler)};
if not defined (user.scheduler.prefs) {
	new (tabletype, @user.scheduler.prefs)};
if not defined (user.scheduler.prefs.confirmStartupTasks) {
	user.scheduler.prefs.confirmStartupTasks = true;
	};ÇThu, Feb 18, 1999 at 1:45:33 PM by PBS
if not defined (user.scheduler.prefs.keepLog) {
	user.scheduler.prefs.keepLog = false};
if not defined (user.scheduler.prefs.logInGuestDatabase) {
	Çuser.scheduler.prefs.logInGuestDatabase = true //PBS 11/23/99: now true
	user.scheduler.prefs.logInGuestDatabase = false}; //PBS 06/24/00: now false by default
if not defined (user.scheduler.overnight) {
	new (tabletype, @user.scheduler.overnight)};
if not defined (user.scheduler.everyMinute) {
	new (tabletype, @user.scheduler.everyMinute)};
if not defined (user.scheduler.hourly) {
	new (tabletype, @user.scheduler.hourly)};

if not defined (user.scheduler.prefs.startingUp) {
	user.scheduler.prefs.startingUp = false};
if not defined (user.scheduler.prefs.reschedule) {
	user.scheduler.prefs.reschedule = true};

bundle { //initialize user.scheduler.tasks
	if not defined (user.scheduler.tasks) {
		new (tabletype, @user.scheduler.tasks)};
	local (day, month, year, hour, minute, second);
	date.get (clock.now (), @day, @month, @year, @hour, @minute, @second);
	if not defined (user.scheduler.tasks.everyMinute) {
		local (adrtable = @user.scheduler.tasks.everyMinute);
		new (tabletype, adrtable);
		adrtable^.error = "";
		adrtable^.minutesBetweenRuns = 1;
		adrtable^.script = @scheduler.doEveryMinute;
		adrtable^.taskTime = date.set (day, month, year, hour, minute + 1, 0)};
	if not defined (user.scheduler.tasks.overnight) {
		local (adrtable = @user.scheduler.tasks.overnight);
		new (tabletype, adrtable);
		adrtable^.error = "";
		adrtable^.minutesBetweenRuns = 1440;
		adrtable^.script = @scheduler.doOvernightTasks;
		adrtable^.taskTime = date.set (day + 1, month, year, 0, 0, 0)};
	if not defined (user.scheduler.tasks.hourly) {
		local (adrtable = @user.scheduler.tasks.hourly);
		new (tabletype, adrtable);
		adrtable^.error = "";
		adrtable^.minutesBetweenRuns = 60;
		adrtable^.script = @scheduler.doHourlyTasks;
		adrtable^.taskTime = date.set (day, month, year, hour + 1, 0, 0)}};
bundle { //upgrade user.scheduler.tasks
	local (i);
	for i = 1 to sizeof (user.scheduler.tasks) {
		adrtask = @user.scheduler.tasks [i];
		if not defined (adrtask^.ctruns) {
			adrtask^.ctRuns = 0}}};
bundle { //6.1 threads-related initialization
	if not defined (user.scheduler.threads) {
		new (tabletype, @user.scheduler.threads)};
	if not defined (user.scheduler.prefs.runThreads) {
		user.scheduler.prefs.runThreads = true}}
\ No newline at end of file
--- 1,3 ----
  FrontierVcsFile:1:scpt:system.verbs.builtins.scheduler.init
  
! ÇChanges
	Ç12/2/04; 11:50:45 PM by TAC
		ÇconfirmStartupTasks is now false by default, so as not to mess up frontier as a server
	Ç11/12/04; 9:13:50 AM by TAC
		Çinitializations moved from system.startup.startupScript
	Ç06/24/00; 1:23:36 AM by PBS
		ÇLogging is off by default.

if not defined (user.scheduler) {
	new (tabletype, @user.scheduler)};
if not defined (user.scheduler.prefs) {
	new (tabletype, @user.scheduler.prefs)};
if not defined (user.scheduler.prefs.confirmStartupTasks) {
	user.scheduler.prefs.confirmStartupTasks = false;
	};ÇThu, Feb 18, 1999 at 1:45:33 PM by PBS
if not defined (user.scheduler.prefs.keepLog) {
	user.scheduler.prefs.keepLog = false};
if not defined (user.scheduler.prefs.logInGuestDatabase) {
	Çuser.scheduler.prefs.logInGuestDatabase = true //PBS 11/23/99: now true
	user.scheduler.prefs.logInGuestDatabase = false}; //PBS 06/24/00: now false by default
if not defined (user.scheduler.overnight) {
	new (tabletype, @user.scheduler.overnight)};
if not defined (user.scheduler.everyMinute) {
	new (tabletype, @user.scheduler.everyMinute)};
if not defined (user.scheduler.hourly) {
	new (tabletype, @user.scheduler.hourly)};
Çif not defined (user.scheduler.prefs.startingUp) // 11/12/04; 9:13:50 AM by TAC - this wasn't doing anything as it used to be set in system.startup.startupScript
	Çuser.scheduler.prefs.startingUp = false
if not defined (user.scheduler.prefs.reschedule) {
	user.scheduler.prefs.reschedule = true};
user.scheduler.prefs.startingup = true; // 11/12/04; 9:13:50 AM by TAC - copied from system.startup.startupScript, will be set to false when scheduler.monitor runs via an agent

bundle { //initialize user.scheduler.tasks
	if not defined (user.scheduler.tasks) {
		new (tabletype, @user.scheduler.tasks)};
	local (day, month, year, hour, minute, second);
	date.get (clock.now (), @day, @month, @year, @hour, @minute, @second);
	if not defined (user.scheduler.tasks.everyMinute) {
		local (adrtable = @user.scheduler.tasks.everyMinute);
		new (tabletype, adrtable);
		adrtable^.error = "";
		adrtable^.minutesBetweenRuns = 1;
		adrtable^.script = @scheduler.doEveryMinute;
		adrtable^.taskTime = date.set (day, month, year, hour, minute + 1, 0)};
	if not defined (user.scheduler.tasks.overnight) {
		local (adrtable = @user.scheduler.tasks.overnight);
		new (tabletype, adrtable);
		adrtable^.error = "";
		adrtable^.minutesBetweenRuns = 1440;
		adrtable^.script = @scheduler.doOvernightTasks;
		adrtable^.taskTime = date.set (day + 1, month, year, 0, 0, 0)};
	if not defined (user.scheduler.tasks.hourly) {
		local (adrtable = @user.scheduler.tasks.hourly);
		new (tabletype, adrtable);
		adrtable^.error = "";
		adrtable^.minutesBetweenRuns = 60;
		adrtable^.script = @scheduler.doHourlyTasks;
		adrtable^.taskTime = date.set (day, month, year, hour + 1, 0, 0)}};
bundle { //upgrade user.scheduler.tasks
	local (i);
	for i = 1 to sizeof (user.scheduler.tasks) {
		adrtask = @user.scheduler.tasks [i];
		if not defined (adrtask^.ctruns) {
			adrtask^.ctRuns = 0}}};
bundle { //6.1 threads-related initialization
	if not defined (user.scheduler.threads) {
		new (tabletype, @user.scheduler.threads)};
	if not defined (user.scheduler.prefs.runThreads) {
		user.scheduler.prefs.runThreads = true}};
bundle { //6.1, be sure pre-defined scheduler tasks have reasonable times, 11/12/04; 9:13:50 AM by TAC - moved from system.startup.startupScript
	local (day, month, year, hour, minute, second);
	date.get (clock.now (), @day, @month, @year, @hour, @minute, @second);
	user.scheduler.tasks.everyMinute.taskTime = date.set (day, month, year, hour, minute + 1, 0);
	user.scheduler.tasks.hourly.taskTime = date.set (day, month, year, hour + 1, 0, 0);
	if user.scheduler.tasks.overnight.taskTime < clock.now () { //PBS 10/6/99: if the overnight task time is before now, reschedule
		local (overnighthour);
		bundle { //preserve hour for overnight task, some people like to run them at 3AM
			local (day, month, year, minute, second);
			date.get (user.scheduler.tasks.overnight.taskTime, @day, @month, @year, @overnighthour, @minute, @second)};
		user.scheduler.tasks.overnight.taskTime = date.set (day, month, year, overnighthour, 0, 0);
		if user.scheduler.tasks.overnight.taskTime < clock.now () { //it's still before now, set it for tomorrow
			user.scheduler.tasks.overnight.taskTime = date.set (day + 1, month, year, overnighthour, 0, 0)}}}
\ No newline at end of file