--- loncom/loncron	2007/02/02 12:59:13	1.70
+++ loncom/loncron	2007/04/03 00:47:26	1.71
@@ -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 @@ ENDERROUT
 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 @@ sub usage {
 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 @@ USAGE
 
 # ================================================================ 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 @@ sub main () {
 	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);