Changeset 16192

Timestamp:

2008-06-25 20:01:23 (5 months ago)

Author:

osborn

Message:

Cron scheduler with further updates and fixes

Files:

• gsdl/trunk/bin/script/schedule.pl (modified) (13 diffs)

gsdl/trunk/bin/script/schedule.pl

@@ -58 +58 @@
-use parse3;
-use gsprintf 'gsprintf';
-
+
+
+
-
-my $frequency_list = 
@@ -217 +219 @@
-    my $hashParsingResult = {}; 
-    my $intArgLeftAfterParsing; 
-$os eq "linux"
+($os eq "linux" || $os eq "darwin")
-        $intArgLeftAfterParsing = parse3::parse(\@ARGV, $arguments, $hashParsingResult, "allow_extra_options"); 
-    } else {
@@ -276 +278 @@
-
-    $newpl = "cron.pl"; 
-    my $logfile = "cron".time().".txt";  
-
-    if($action eq "delete") {
@@ -300 +301 @@
-        if ($os =~ /^linux$/ || $os =~ /^darwin$/) {
- 
-
-
-
-
-
+\
+\
+\
+\
+\
-            if($email) {
-                #first,we need to add backslashes before the 'at' symbol. 
@@ -310 +311 @@
-                $fromaddr =~ s/\@/\\\@/g; 
-
-$logfile -subject \\\"Results of build for collection $colname\\\" 2>>$gsdl/collect/$colname/log/$logfile >>$gsdl/collect/$colname/log/
-
-$logfile >>$gsdl/collect/$colname/log/
+\$logfile -subject \\\"Results of build for collection $colname\\\" 2>>$gsdl/collect/$colname/log/\
+
+\
-            }
-   
@@ -338 +339 @@
-            $build =~ s/\\collect/\\collect\\\"/; 
-
-
-
-
-
-
-
-
+\
+\
+
+
+\
+\
+\
-            if($email) {
-                $toaddr =~ s/\@/\\\@/g; 
-                $fromaddr =~ s/\@/\\\@/g; 
-$logfile\\\" -subject \\\"Results of build for collection $colname\\\" >>\\\"$gsdl\\\\collect\\\\$colname\\\\log
-
-
+\$logfile\\\" -subject \\\"Results of build for collection $colname\\\" >>\\\"$gsdl\\\\collect\\\\$colname\\\\log\
+
+\
-            }
-        }
@@ -372 +373 @@
-        print $nf "\$ENV{'PATH'}=\"$path\"\;\n";  
-
+        print $nf "\$logfile = \"cron\".time\(\).\".txt\"\;\n";
+
-        if($os =~ /^windows$/) {
-                print $nf "if\(-e \\\"$gsdl\\\\collect\\\\$colname\\\\etc\\\\cron.lck\\\" \"\)\{ \n"; 
@@ -381 +384 @@
-        }
-        else { 
-
+
+
+
+
+
-
-        }
@@ -396 +403 @@
-                print $nf "system(\"echo lock \>\\\"$gsdl\\\\collect\\\\$colname\\\\etc\\\\cron.lck\\\"\")\;\n"; 
-        } else { 
-\\\"$gsdl/collect/$colname/etc/cron.lck\\\" 
+$gsdl/collect/$colname/etc/cron.lck
-        }
-
@@ -530 +537 @@
-                
-                
+                my $shortf = Win32::GetShortPathName($gsdl); 
+
+                my $command = "$shortf\\bin\\windows\\silentstart $shortf\\bin\\windows\\perl\\bin\\perl $shortf\\collect\\$colname\\cron.pl\n"; 
+                
-                if($action =~ /^add$/ || $action =~ /^update$/)
-                {
@@ -536 +547 @@
-
-                    if($frequency eq "hourly") {
-silentstart.exe $gsdl\\collect\\$colname\\cron.pl\n
+$command
-                    }
-                    elsif($frequency eq "daily") {
-silentstart.exe $gsdl\\collect\\$colname\\cron.pl\n
+$command
-                    }
-                    elsif($frequency eq "weekly") {
-silentstart.exe $gsdl\\collect\\$colname\\cron.pl\n
+$command
-                    }
-                    close($nf);
@@ -548 +559 @@
-
-        } else {        
+
+            my $shortf = Win32::GetShortPathName($gsdl); 
+
+            my $command = "$shortf\\bin\\windows\\silentstart $shortf\\bin\\windows\\perl\\bin\\perl $shortf\\collect\\$colname\\cron.pl\n"; 
+                
+
-            if($action =~ /^add$/ || $action =~ /^update$/)
-            {
@@ -553 +570 @@
-            (&gsprintf(STDERR, "{common.cannot_open_output_file}: $!\n", $out) && die);
-                if($frequency eq "hourly") {
-silentstart.exe $gsdl\\collect\\$colname\\cron.pl\n
+$command
-                }
-                elsif($frequency eq "daily") {
-silentstart.exe $gsdl\\collect\\$colname\\cron.pl\n
+$command
-                }
-                elsif($frequency eq "weekly") {
-silentstart.exe $gsdl\\collect\\$colname\\cron.pl\n
+$command
-                }
-