[LON-CAPA-cvs] cvs: loncom / loncron /init.d loncontrol

[albertel]

albertel		Mon Apr  2 20:47:28 2007 EDT

  Modified files:              
    /loncom	loncron 
    /loncom/init.d	loncontrol 
  Log:
  - eliminated old lonc
  
  
Index: loncom/loncron
diff -u loncom/loncron:1.70 loncom/loncron:1.71
--- loncom/loncron:1.70	Fri Feb  2 07:59:13 2007
+++ loncom/loncron	Mon Apr  2 20:47:26 2007
@@ -2,7 +2,7 @@
 
 # Housekeeping program, started by cron, loncontrol and loncron.pl
 #
-# $Id: loncron,v 1.70 2007/02/02 12:59:13 raeburn Exp $
+# $Id: loncron,v 1.71 2007/04/03 00:47:26 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -79,9 +79,8 @@
 sub start_daemon {
     my ($fh,$daemon,$pidfile,$args) = @_;
     my $progname=$daemon;
-    if ($daemon eq 'lonc' && $args eq 'new') {
+    if ($daemon eq 'lonc') {
 	$progname='loncnew'; 
-	print "new ";
     }
     my $error_fname="$perlvar{'lonDaemons'}/logs/${daemon}_errors";
     my $size=(stat($error_fname))[7];
@@ -602,8 +601,7 @@
 loncron - housekeeping program that checks up on various parts of Lon-CAPA
 
 Options:
-   --help     Display help
-   --oldlonc  When starting the lonc daemon use 'lonc' not 'loncnew'
+   --help     Display 
    --noemail  Do not send the status email
    --justcheckconnections  Only check the current status of the lonc/d
                                 connections, do not send emails do not
@@ -623,10 +621,9 @@
 
 # ================================================================ Main Program
 sub main () {
-    my ($oldlonc,$help,$justcheckdaemons,$noemail,$justcheckconnections,
+    my ($help,$justcheckdaemons,$noemail,$justcheckconnections,
 	$justreload);
     &GetOptions("help"                 => \$help,
-		"oldlonc"              => \$oldlonc,
 		"justcheckdaemons"     => \$justcheckdaemons,
 		"noemail"              => \$noemail,
 		"justcheckconnections" => \$justcheckconnections,
@@ -714,18 +711,14 @@
 	if ( &checkon_daemon($fh,'lond',40000,'USR1') eq 'running') {
 	    &checkon_daemon($fh,'lond',40000,'USR2');
 	}
-	my $args='new';
-	if ($oldlonc) { $args = ''; }
-	&checkon_daemon($fh,'lonc',40000,'USR1',$args);
+	&checkon_daemon($fh,'lonc',40000,'USR1');
 	&checkon_daemon($fh,'lonhttpd',40000);
 	&checkon_daemon($fh,'lonmemcached',40000);
         &checkon_daemon($fh,'lonmaxima',40000);
     }
     if ($justreload) {
 	&checkon_daemon($fh,'lond',40000,'USR2');
-	my $args='new';
-	if ($oldlonc) { $args = ''; }
-	&checkon_daemon($fh,'lonc',40000,'USR2',$args);
+	&checkon_daemon($fh,'lonc',40000,'USR2');
     }
     if ($justcheckconnections) {
 	&test_connections($fh,\%hostname);
Index: loncom/init.d/loncontrol
diff -u loncom/init.d/loncontrol:1.28 loncom/init.d/loncontrol:1.29
--- loncom/init.d/loncontrol:1.28	Fri Feb  2 07:59:15 2007
+++ loncom/init.d/loncontrol	Mon Apr  2 20:47:28 2007
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 #
-# $Id: loncontrol,v 1.28 2007/02/02 12:59:15 raeburn Exp $
+# $Id: loncontrol,v 1.29 2007/04/03 00:47:28 albertel Exp $
 #
 # The LearningOnline Network with CAPA
 #
@@ -159,16 +159,7 @@
 }
 
 
-if (($command eq "restartold") or ($command eq "reloadold")) {
-    print 'Restarting LON-CAPA'."\n";
-    print 'Ending LON-CAPA client and daemon processes'."\n";
-    foreach my $daemon ('lonsql','lond','lonc','lonhttpd','lonmemcached','lonmaxima') {
-	&stop_daemon($daemon,$daemon);
-    }
-    print 'Starting LON-CAPA client and daemon processes (please be patient)'.
-	"\n";
-    system("su www -c '/home/httpd/perl/loncron --oldlonc --justcheckdaemons'");
-} elsif ($command eq "restart") {
+if ($command eq "restart") {
     print 'Restarting LON-CAPA'."\n";
     print 'Ending LON-CAPA client and daemon processes'."\n";
     foreach my $daemon ('lonsql','lond','lonc','lonhttpd','lonmemcached','lonmaxima') {
@@ -187,12 +178,6 @@
 	&stop_daemon($daemon,$killallname);
     }
     &firewall_close_port();
-} elsif ($command eq "startold") {
-    &firewall_open_port();
-    print 'Starting LON-CAPA'."\n";
-    print 'Starting LON-CAPA client and daemon processes (please be patient)'.
-	"\n"; 
-    system("su www -c '/home/httpd/perl/loncron --oldlonc --justcheckdaemons'");
 } elsif ($command eq "start") {
     &firewall_open_port();
     print 'Starting LON-CAPA'."\n";