--- loncom/init.d/loncontrol	2004/12/02 21:16:56	1.22
+++ loncom/init.d/loncontrol	2007/06/12 23:45:42	1.32
@@ -1,5 +1,7 @@
 #!/usr/bin/perl
 #
+# $Id: loncontrol,v 1.32 2007/06/12 23:45:42 albertel Exp $
+#
 # The LearningOnline Network with CAPA
 #
 # Copyright Michigan State University Board of Trustees
@@ -30,11 +32,21 @@
 # chkconfig: 345 95 5
 # description: LON-CAPA is a "network of knowledge".  It is used to \
 # distribute knowledge resources and instructional management.
-# processnames: lonc, lond, lonsql
+# processnames: lonc, lond, lonsql, lonmaxima
 # pidfiles: /home/httpd/perl/logs/lon*.pid
 # 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;
 
@@ -45,6 +57,12 @@ $ENV{'BASH_ENV'}="";
     # Firewall code is based on the code in FC2 /etc/init.d/ntpd
     my $fw_chain = 'RH-Firewall-1-INPUT';
     my $iptables = '/sbin/iptables';
+    if (! -e $iptables) {
+	$iptables = '/usr/sbin/iptables';
+	if (! -e $iptables) {
+	    print("Unable to find iptables command\n");
+	}
+    }
     my $lond_port = 5663;
     my $lonhttpd_port = 8080;
 
@@ -120,16 +138,19 @@ 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>;
 	chomp($daemonpid);
 	kill TERM => $daemonpid;
-	sleep 2;
+	my $count=0;
+	while ($count++ < 5 && kill(0 => $daemonpid)) {
+	    sleep 1;
+	}
 	if (kill 0 => $daemonpid) {
 	    kill KILL => $daemonpid;
-	    sleep 2;
+	    sleep 1;
 	    if (kill 0 => $daemonpid) {
 		print("failed to kill");
 	    } else {
@@ -146,23 +167,23 @@ sub stop_daemon {
 	system("killall -q $killallname");
 	print(", killed off extraneous processes");
     }
+    unlink($pidfile);
     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') {
-	&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") or ($command eq "reload")) {
+}
+
+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') {
+    foreach my $daemon ('lonsql','lond','lonc','lonhttpd','lonmemcached','lonmaxima') {
 	my $killallname=$daemon;
 	if ($daemon eq 'lonc') { $killallname='loncnew'; }
 	&stop_daemon($daemon,$killallname);
@@ -172,24 +193,22 @@ 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','lonmaxima') {
 	my $killallname=$daemon;
 	if ($daemon eq 'lonc') { $killallname='loncnew'; }
 	&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";
     print 'Starting LON-CAPA client and daemon processes (please be patient)'.
 	"\n"; 
     system("su www -c '/home/httpd/perl/loncron --justcheckdaemons'");
+} elsif ($command eq "reload") {
+    print 'Reload LON-CAPA config files'."\n";
+    system("su www -c '/home/httpd/perl/loncron --justreload'");
 } elsif ($command eq "status") {
     $response=`/bin/cat /home/httpd/perl/logs/*.pid 2>&1`;
     if ($response=~/No such file or directory/) {