--- loncom/init.d/loncontrol	2007/04/03 00:47:28	1.29
+++ loncom/init.d/loncontrol	2007/06/12 23:45:42	1.32
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 #
-# $Id: loncontrol,v 1.29 2007/04/03 00:47:28 albertel Exp $
+# $Id: loncontrol,v 1.32 2007/06/12 23:45:42 albertel Exp $
 #
 # The LearningOnline Network with CAPA
 #
@@ -37,6 +37,16 @@
 # config: /etc/httpd/conf/loncapa.conf
 # config: /home/httpd/lonTabs/hosts.tab
 # config: /home/httpd/lonTabs/spare.tab
+# SuSE chkconfig/insserv info
+### BEGIN INIT INFO
+# Provides:       loncapa
+# Required-Start: mysql apache2 $network $remote_fs
+# Required-Stop:
+# Default-Start:  3 4 5
+# Default-Stop:
+# Description:    Starts the LON-CAPA services
+### END INIT INFO
+
 
 $command=$ARGV[0]; $command=~s/[^a-z]//g;
 
@@ -134,7 +144,10 @@ sub stop_daemon {
 	my $daemonpid=<PIDFILE>;
 	chomp($daemonpid);
 	kill TERM => $daemonpid;
-	sleep 1;
+	my $count=0;
+	while ($count++ < 5 && kill(0 => $daemonpid)) {
+	    sleep 1;
+	}
 	if (kill 0 => $daemonpid) {
 	    kill KILL => $daemonpid;
 	    sleep 1;
@@ -158,6 +171,14 @@ sub stop_daemon {
     print("\n");
 }
 
+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");
+    }
+}
 
 if ($command eq "restart") {
     print 'Restarting LON-CAPA'."\n";
@@ -178,6 +199,7 @@ if ($command eq "restart") {
 	&stop_daemon($daemon,$killallname);
     }
     &firewall_close_port();
+    &clean_sockets();
 } elsif ($command eq "start") {
     &firewall_open_port();
     print 'Starting LON-CAPA'."\n";