--- loncom/init.d/loncontrol	2002/10/19 22:00:03	1.9
+++ loncom/init.d/loncontrol	2004/04/01 22:14:42	1.17
@@ -5,11 +5,8 @@
 # Startup script for the LON-CAPA network processes
 #
 # YEAR=2000
-# 10/25 Scott Harrison
 # YEAR=2001
-# 10/2 Scott Harrison
 # YEAR=2002
-# 5/11 Scott Harrison
 
 # chkconfig: 345 95 5
 # description: LON-CAPA is a "network of knowledge".  It is used to
@@ -25,25 +22,66 @@ $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")) {
+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");
+}
+
+if (($command eq "restartold") or ($command eq "reloadold")) {
     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`;
+    foreach my $daemon ('lonsql','lond','lonc','lonhttpd') {
+	&stop_daemon($daemon);
+    }
     print 'Starting LON-CAPA client and daemon processes (please be patient)'.
 	"\n";
-    system("su -c '/home/httpd/perl/loncron' www");
-}
-elsif ($command eq "stop") {
+    system("su www -c '/home/httpd/perl/loncron'");
+} 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 new'");
+} 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") {
+    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 -c '/home/httpd/perl/loncron' www");
-}
-elsif ($command eq "status") {
+    system("su www -c '/home/httpd/perl/loncron'");
+} 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 new'");
+} 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";
@@ -51,8 +89,7 @@ elsif ($command eq "status") {
     else {
 	print 'LON-CAPA is running.'."\n";
     }
-}
-else {
+} else {
     print 'You need to specify restart|stop|start|status on the command line'.
 	' argument.'."\n";
 }