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

Diff for /loncom/init.d/loncontrol between versions 1.18 and 1.19

version 1.18, 2004/05/11 21:22:04 version 1.19, 2004/08/19 18:31:42
Line 23  $ENV{'PATH'}="/sbin:/bin:/usr/sbin:/usr/ Line 23  $ENV{'PATH'}="/sbin:/bin:/usr/sbin:/usr/
 $ENV{'BASH_ENV'}="";  $ENV{'BASH_ENV'}="";
   
 sub stop_daemon {  sub stop_daemon {
     my ($daemon)=@_;      my ($daemon,$killallname)=@_;
     my $pidfile="/home/httpd/perl/logs/$daemon.pid";      my $pidfile="/home/httpd/perl/logs/$daemon.pid";
           
     printf("%-10s ",$daemon);      printf("%-10s ",$daemon);
Line 37  sub stop_daemon { Line 37  sub stop_daemon {
     kill KILL => $daemonpid;      kill KILL => $daemonpid;
     sleep 2;      sleep 2;
     if (kill 0 => $daemonpid) {      if (kill 0 => $daemonpid) {
  print("failed to kill\n"); return;   print("failed to kill");
     } else {      } else {
  print("killed\n"); return;   print("killed");
     }      }
  } else {   } else {
     print("stopped\n"); return;      print("stopped");
  }   }
       } else {
    print("not running");
     }      }
     print("not running\n");      system("killall -q -0 $killallname");
       if ($? == 0) {
    system("killall -q $killallname");
    print(", killed off extraneous processes");
       }
       print("\n");
 }  }
   
 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') {
  &stop_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";
Line 61  if (($command eq "restartold") or ($comm Line 68  if (($command eq "restartold") or ($comm
     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') {
  &stop_daemon($daemon);   my $killallname=$daemon;
    if ($daemon eq 'lonc') { $killallname='loncnew'; }
    &stop_daemon($daemon,$killallname);
     }      }
     print 'Starting LON-CAPA client and daemon processes (please be patient)'.      print 'Starting LON-CAPA client and daemon processes (please be patient)'.
  "\n";   "\n";
Line 69  if (($command eq "restartold") or ($comm Line 78  if (($command eq "restartold") or ($comm
 } 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') {
  &stop_daemon($daemon);   my $killallname=$daemon;
    if ($daemon eq 'lonc') { $killallname='loncnew'; }
    &stop_daemon($daemon,$killallname);
     }      }
 } elsif ($command eq "startold") {  } elsif ($command eq "startold") {
     print 'Starting LON-CAPA'."\n";      print 'Starting LON-CAPA'."\n";
Removed from v.1.18  
changed lines
  Added in v.1.19

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