Diff for /loncom/init.d/loncontrol between versions 1.22 and 1.25

version 1.22, 2004/12/02 21:16:56 version 1.25, 2005/05/26 20:25:00
Line 1 Line 1
 #!/usr/bin/perl  #!/usr/bin/perl
 #  #
   # $Id$
   #
 # The LearningOnline Network with CAPA  # The LearningOnline Network with CAPA
 #  #
 # Copyright Michigan State University Board of Trustees  # Copyright Michigan State University Board of Trustees
Line 120  sub stop_daemon { Line 122  sub stop_daemon {
     my ($daemon,$killallname)=@_;      my ($daemon,$killallname)=@_;
     my $pidfile="/home/httpd/perl/logs/$daemon.pid";      my $pidfile="/home/httpd/perl/logs/$daemon.pid";
           
     printf("%-10s ",$daemon);      printf("%-15s ",$daemon);
     if (-e $pidfile) {      if (-e $pidfile) {
  open(PIDFILE,$pidfile);   open(PIDFILE,$pidfile);
  my $daemonpid=<PIDFILE>;   my $daemonpid=<PIDFILE>;
Line 146  sub stop_daemon { Line 148  sub stop_daemon {
  system("killall -q $killallname");   system("killall -q $killallname");
  print(", killed off extraneous processes");   print(", killed off extraneous processes");
     }      }
       unlink($pidfile);
     print("\n");      print("\n");
 }  }
   
Line 153  sub stop_daemon { Line 156  sub stop_daemon {
 if (($command eq "restartold") or ($command eq "reloadold")) {  if (($command eq "restartold") or ($command eq "reloadold")) {
     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') {      foreach my $daemon ('lonsql','lond','lonc','lonhttpd','lonmemcached') {
  &stop_daemon($daemon,$daemon);   &stop_daemon($daemon,$daemon);
     }      }
     print 'Starting LON-CAPA client and daemon processes (please be patient)'.      print 'Starting LON-CAPA client and daemon processes (please be patient)'.
  "\n";   "\n";
     system("su www -c '/home/httpd/perl/loncron --oldlonc --justcheckdaemons'");      system("su www -c '/home/httpd/perl/loncron --oldlonc --justcheckdaemons'");
 } elsif (($command eq "restart") or ($command eq "reload")) {  } 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') {      foreach my $daemon ('lonsql','lond','lonc','lonhttpd','lonmemcached') {
  my $killallname=$daemon;   my $killallname=$daemon;
  if ($daemon eq 'lonc') { $killallname='loncnew'; }   if ($daemon eq 'lonc') { $killallname='loncnew'; }
  &stop_daemon($daemon,$killallname);   &stop_daemon($daemon,$killallname);
Line 172  if (($command eq "restartold") or ($comm Line 175  if (($command eq "restartold") or ($comm
     system("su www -c '/home/httpd/perl/loncron --justcheckdaemons'");      system("su www -c '/home/httpd/perl/loncron --justcheckdaemons'");
 } elsif ($command eq "stop") {  } elsif ($command eq "stop") {
     print 'Stopping LON-CAPA'."\n";      print 'Stopping LON-CAPA'."\n";
     foreach my $daemon ('lonsql','lond','lonc','lonhttpd') {      foreach my $daemon ('lonsql','lond','lonc','lonhttpd','lonmemcached') {
  my $killallname=$daemon;   my $killallname=$daemon;
  if ($daemon eq 'lonc') { $killallname='loncnew'; }   if ($daemon eq 'lonc') { $killallname='loncnew'; }
  &stop_daemon($daemon,$killallname);   &stop_daemon($daemon,$killallname);
Line 190  if (($command eq "restartold") or ($comm Line 193  if (($command eq "restartold") or ($comm
     print 'Starting LON-CAPA client and daemon processes (please be patient)'.      print 'Starting LON-CAPA client and daemon processes (please be patient)'.
  "\n";    "\n"; 
     system("su www -c '/home/httpd/perl/loncron --justcheckdaemons'");      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") {  } elsif ($command eq "status") {
     $response=`/bin/cat /home/httpd/perl/logs/*.pid 2>&1`;      $response=`/bin/cat /home/httpd/perl/logs/*.pid 2>&1`;
     if ($response=~/No such file or directory/) {      if ($response=~/No such file or directory/) {

Removed from v.1.22  
changed lines
  Added in v.1.25


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