--- loncom/init.d/loncontrol	2007/02/02 12:59:15	1.28
+++ loncom/init.d/loncontrol	2007/05/31 05:20:06	1.30
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 #
-# $Id: loncontrol,v 1.28 2007/02/02 12:59:15 raeburn Exp $
+# $Id: loncontrol,v 1.30 2007/05/31 05:20:06 albertel Exp $
 #
 # The LearningOnline Network with CAPA
 #
@@ -158,17 +158,16 @@ sub stop_daemon {
     print("\n");
 }
 
-
-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);
+sub clean_sockets {
+    opendir(SOCKETS,"/home/httpd/sockets/");
+    while (my $fname=readdir(SOCKETS)) {
+	next if (-d $fname
+		 || $fname=~/(mysqlsock|maximasock|\Q$perlvar{'lonSockDir'}\E)/);
+	unlink("/home/httpd/sockets/$fname");
     }
-    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 +186,7 @@ if (($command eq "restartold") or ($comm
 	&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'");
+    &clean_sockets();
 } elsif ($command eq "start") {
     &firewall_open_port();
     print 'Starting LON-CAPA'."\n";