--- loncom/init.d/loncontrol	2004/12/20 14:28:56	1.23
+++ loncom/init.d/loncontrol	2005/02/14 00:29:48	1.24
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 #
-# $Id: loncontrol,v 1.23 2004/12/20 14:28:56 matthew Exp $
+# $Id: loncontrol,v 1.24 2005/02/14 00:29:48 albertel Exp $
 #
 # The LearningOnline Network with CAPA
 #
@@ -122,7 +122,7 @@ sub stop_daemon {
     my ($daemon,$killallname)=@_;
     my $pidfile="/home/httpd/perl/logs/$daemon.pid";
     
-    printf("%-10s ",$daemon);
+    printf("%-15s ",$daemon);
     if (-e $pidfile) {
 	open(PIDFILE,$pidfile);
 	my $daemonpid=<PIDFILE>;
@@ -148,6 +148,7 @@ sub stop_daemon {
 	system("killall -q $killallname");
 	print(", killed off extraneous processes");
     }
+    unlink($pidfile);
     print("\n");
 }
 
@@ -155,7 +156,7 @@ sub stop_daemon {
 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') {
+    foreach my $daemon ('lonsql','lond','lonc','lonhttpd','lonmemcached') {
 	&stop_daemon($daemon,$daemon);
     }
     print 'Starting LON-CAPA client and daemon processes (please be patient)'.
@@ -164,7 +165,7 @@ if (($command eq "restartold") or ($comm
 } 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') {
+    foreach my $daemon ('lonsql','lond','lonc','lonhttpd','lonmemcached') {
 	my $killallname=$daemon;
 	if ($daemon eq 'lonc') { $killallname='loncnew'; }
 	&stop_daemon($daemon,$killallname);
@@ -174,7 +175,7 @@ if (($command eq "restartold") or ($comm
     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') {
+    foreach my $daemon ('lonsql','lond','lonc','lonhttpd','lonmemcached') {
 	my $killallname=$daemon;
 	if ($daemon eq 'lonc') { $killallname='loncnew'; }
 	&stop_daemon($daemon,$killallname);