Diff for /loncom/loncnew between versions 1.69 and 1.74

version 1.69, 2005/03/24 22:57:56 version 1.74, 2006/01/27 20:37:12
Line 106  my $ConnectionCount = 0; Line 106  my $ConnectionCount = 0;
 my $IdleSeconds     = 0; # Number of seconds idle.  my $IdleSeconds     = 0; # Number of seconds idle.
 my $Status          = ""; # Current status string.  my $Status          = ""; # Current status string.
 my $RecentLogEntry  = "";  my $RecentLogEntry  = "";
 my $ConnectionRetries=2; # Number of connection retries allowed.  my $ConnectionRetries=5; # Number of connection retries allowed.
 my $ConnectionRetriesLeft=2; # Number of connection retries remaining.  my $ConnectionRetriesLeft=5; # Number of connection retries remaining.
 my $LondVersion     = "unknown"; # Version of lond we talk with.  my $LondVersion     = "unknown"; # Version of lond we talk with.
 my $KeyMode         = "";       # e.g. ssl, local, insecure from last connect.  my $KeyMode         = "";       # e.g. ssl, local, insecure from last connect.
 my $LondConnecting  = 0;       # True when a connection is being built.  my $LondConnecting  = 0;       # True when a connection is being built.
Line 677  sub FailTransaction { Line 677  sub FailTransaction {
   
     if ($ConnectionRetriesLeft > 0) {      if ($ConnectionRetriesLeft > 0) {
  Log("WARNING", "Failing transaction "   Log("WARNING", "Failing transaction "
     .$transaction->getRequest());      .$transaction->getLoggableRequest());
     }      }
     Debug(1, "Failing transaction: ".$transaction->getRequest());      Debug(1, "Failing transaction: ".$transaction->getLoggableRequest());
     if (!$transaction->isDeferred()) { # If the transaction is deferred we'll get to it.      if (!$transaction->isDeferred()) { # If the transaction is deferred we'll get to it.
  my $client  = $transaction->getClient();   my $client  = $transaction->getClient();
  Debug(1," Replying con_lost to ".$transaction->getRequest());   Debug(1," Replying con_lost to ".$transaction->getRequest());
Line 955  sub LondReadable { Line 955  sub LondReadable {
  #  We need to be writable for this and probably don't belong   #  We need to be writable for this and probably don't belong
  #  here inthe first place.   #  here inthe first place.
   
  Deubg(6, "SendingRequest state encountered in readable");   Debug(6, "SendingRequest state encountered in readable");
  $Watcher->poll("w");   $Watcher->poll("w");
  $Watcher->cb(\&LondWritable);   $Watcher->cb(\&LondWritable);
   
Line 1598  sub ChildStatus { Line 1598  sub ChildStatus {
     flock(LOG,LOCK_UN);      flock(LOG,LOCK_UN);
     close(LOG);      close(LOG);
     $ConnectionRetriesLeft = $ConnectionRetries;      $ConnectionRetriesLeft = $ConnectionRetries;
       UpdateStatus();
 }  }
   
 =pod  =pod
Line 1874  sub listen_on_all_unix_sockets { Line 1875  sub listen_on_all_unix_sockets {
     my $host_iterator      =   &LondConnection::GetHostIterator();      my $host_iterator      =   &LondConnection::GetHostIterator();
     while (!$host_iterator->end()) {      while (!$host_iterator->end()) {
  my $host_entry_ref =   $host_iterator->get();   my $host_entry_ref =   $host_iterator->get();
  my $host_name      = $host_entry_ref->[0];   my $host_name      = $host_entry_ref->[3];
  Debug(9, "Listen for $host_name");   Debug(9, "Listen for $host_name");
  &parent_listen($host_name);   &parent_listen($host_name);
  $host_iterator->next();   $host_iterator->next();

Removed from v.1.69  
changed lines
  Added in v.1.74


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