Diff for /loncom/init.d/loncontrol between versions 1.28 and 1.32

version 1.28, 2007/02/02 12:59:15 version 1.32, 2007/06/12 23:45:42
Line 37 Line 37
 # config: /etc/httpd/conf/loncapa.conf  # config: /etc/httpd/conf/loncapa.conf
 # config: /home/httpd/lonTabs/hosts.tab  # config: /home/httpd/lonTabs/hosts.tab
 # config: /home/httpd/lonTabs/spare.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;  $command=$ARGV[0]; $command=~s/[^a-z]//g;
   
Line 134  sub stop_daemon { Line 144  sub stop_daemon {
  my $daemonpid=<PIDFILE>;   my $daemonpid=<PIDFILE>;
  chomp($daemonpid);   chomp($daemonpid);
  kill TERM => $daemonpid;   kill TERM => $daemonpid;
  sleep 1;   my $count=0;
    while ($count++ < 5 && kill(0 => $daemonpid)) {
       sleep 1;
    }
  if (kill 0 => $daemonpid) {   if (kill 0 => $daemonpid) {
     kill KILL => $daemonpid;      kill KILL => $daemonpid;
     sleep 1;      sleep 1;
Line 158  sub stop_daemon { Line 171  sub stop_daemon {
     print("\n");      print("\n");
 }  }
   
   sub clean_sockets {
 if (($command eq "restartold") or ($command eq "reloadold")) {      opendir(SOCKETS,"/home/httpd/sockets/");
     print 'Restarting LON-CAPA'."\n";      while (my $fname=readdir(SOCKETS)) {
     print 'Ending LON-CAPA client and daemon processes'."\n";   next if (-d $fname
     foreach my $daemon ('lonsql','lond','lonc','lonhttpd','lonmemcached','lonmaxima') {   || $fname=~/(mysqlsock|maximasock|\Q$perlvar{'lonSockDir'}\E)/);
  &stop_daemon($daemon,$daemon);   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'");  if ($command eq "restart") {
 } elsif ($command eq "restart") {  
     print 'Restarting LON-CAPA'."\n";      print 'Restarting LON-CAPA'."\n";
     print 'Ending LON-CAPA client and daemon processes'."\n";      print 'Ending LON-CAPA client and daemon processes'."\n";
     foreach my $daemon ('lonsql','lond','lonc','lonhttpd','lonmemcached','lonmaxima') {      foreach my $daemon ('lonsql','lond','lonc','lonhttpd','lonmemcached','lonmaxima') {
Line 187  if (($command eq "restartold") or ($comm Line 199  if (($command eq "restartold") or ($comm
  &stop_daemon($daemon,$killallname);   &stop_daemon($daemon,$killallname);
     }      }
     &firewall_close_port();      &firewall_close_port();
 } elsif ($command eq "startold") {      &clean_sockets();
     &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'");  
 } elsif ($command eq "start") {  } elsif ($command eq "start") {
     &firewall_open_port();      &firewall_open_port();
     print 'Starting LON-CAPA'."\n";      print 'Starting LON-CAPA'."\n";

Removed from v.1.28  
changed lines
  Added in v.1.32


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>