[BACK]Return to loncontrol CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / init.d

Diff for /loncom/init.d/loncontrol between versions 1.23 and 1.24

version 1.23, 2004/12/20 14:28:56 version 1.24, 2005/02/14 00:29:48
Line 122  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 148  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 155  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)'.
Line 164  if (($command eq "restartold") or ($comm Line 165  if (($command eq "restartold") or ($comm
 } elsif (($command eq "restart") or ($command eq "reload")) {  } elsif (($command eq "restart") or ($command eq "reload")) {
     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 174  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);
Removed from v.1.23  
changed lines
  Added in v.1.24

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