--- loncom/init.d/loncontrol	2000/10/27 18:06:00	1.4
+++ loncom/init.d/loncontrol	2004/05/11 21:22:04	1.18
@@ -1,14 +1,19 @@
 #!/usr/bin/perl
 #
+# The LearningOnline Network with CAPA
+#
 # Startup script for the LON-CAPA network processes
-# Scott Harrison 10/25/2000
 #
+# YEAR=2000
+# YEAR=2001
+# YEAR=2002
+
 # chkconfig: 345 95 5
-# description: LON-CAPA is an knowledge network server.  It is used to distribute \
-#              knowledge resources and instructional management.
+# description: LON-CAPA is a "network of knowledge".  It is used to
+# distribute knowledge resources and instructional management.
 # processnames: lonc, lond, lonsql
 # pidfiles: /home/httpd/perl/logs/lon*.pid
-# config: /etc/httpd/conf/access.conf
+# config: /etc/httpd/conf/loncapa.conf
 # config: /home/httpd/lonTabs/hosts.tab
 # config: /home/httpd/lonTabs/spare.tab
 
@@ -17,31 +22,73 @@ $command=$ARGV[0]; $command=~s/[^a-z]//g
 $ENV{'PATH'}="/sbin:/bin:/usr/sbin:/usr/bin:/usr/X11R6/bin:/root/bin";
 $ENV{'BASH_ENV'}="";
 
-if (($command eq "restart") or ($command eq "reload")) {
-    print "Restarting LON-CAPA\n";
-    print "Ending LON-CAPA client and daemon processes\n";
-    print `su -c '/bin/kill \`/bin/cat /home/httpd/perl/logs/*.pid\`' www`;
-    print "Starting LON-CAPA client and daemon processes (please be patient)\n";
-    system("su -c '/home/httpd/perl/loncron' www");
-}
-elsif ($command eq "stop") {
-    print "Stopping LON-CAPA\n";
-    print `su -c '/bin/kill \`/bin/cat /home/httpd/perl/logs/*.pid\`' www`;
-}
-elsif ($command eq "start") {
-    print "Starting LON-CAPA\n";
-    print "Starting LON-CAPA client and daemon processes (please be patient)\n"; 
-    system("su -c /home/httpd/perl/loncron www");
+sub stop_daemon {
+    my ($daemon)=@_;
+    my $pidfile="/home/httpd/perl/logs/$daemon.pid";
+    
+    printf("%-10s ",$daemon);
+    if (-e $pidfile) {
+	open(PIDFILE,$pidfile);
+	my $daemonpid=<PIDFILE>;
+	chomp($daemonpid);
+	kill TERM => $daemonpid;
+	sleep 2;
+	if (kill 0 => $daemonpid) {
+	    kill KILL => $daemonpid;
+	    sleep 2;
+	    if (kill 0 => $daemonpid) {
+		print("failed to kill\n"); return;
+	    } else {
+		print("killed\n"); return;
+	    }
+	} else {
+	    print("stopped\n"); return;
+	}
+    }
+    print("not running\n");
 }
-elsif ($command eq "status") {
+
+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') {
+	&stop_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") or ($command eq "reload")) {
+    print 'Restarting LON-CAPA'."\n";
+    print 'Ending LON-CAPA client and daemon processes'."\n";
+    foreach my $daemon ('lonsql','lond','lonc','lonhttpd') {
+	&stop_daemon($daemon);
+    }
+    print 'Starting LON-CAPA client and daemon processes (please be patient)'.
+	"\n";
+    system("su www -c '/home/httpd/perl/loncron --justcheckdaemons'");
+} elsif ($command eq "stop") {
+    print 'Stopping LON-CAPA'."\n";
+    foreach my $daemon ('lonsql','lond','lonc','lonhttpd') {
+	&stop_daemon($daemon);
+    }
+} elsif ($command eq "startold") {
+    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") {
+    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 --justcheckdaemons'");
+} elsif ($command eq "status") {
     $response=`/bin/cat /home/httpd/perl/logs/*.pid 2>&1`;
     if ($response=~/No such file or directory/) {
-	print "LON-CAPA is not running.\n";
+	print 'LON-CAPA is not running.'."\n";
+    } else {
+	print 'LON-CAPA is running.'."\n";
+	system("su www -c '/home/httpd/perl/loncron --justcheckconnections'");
     }
-    else {
-	print "LON-CAPA is running.\n";
-    }
-}
-else {
-    print "You need to specify restart|stop|start|status on the command line argument.\n";
+} else {
+    print 'You need to specify one of restart|stop|start|status on the command line.'."\n";
 }