--- loncom/loncnew 2011/06/17 16:36:29 1.99 +++ loncom/loncnew 2017/10/20 20:20:20 1.102 @@ -2,7 +2,7 @@ # The LearningOnline Network with CAPA # lonc maintains the connections to remote computers # -# $Id: loncnew,v 1.99 2011/06/17 16:36:29 raeburn Exp $ +# $Id: loncnew,v 1.102 2017/10/20 20:20:20 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -611,7 +611,7 @@ sub CompleteTransaction { StartClientReply($Transaction, $data); } else { # Delete deferred transaction file. Log("SUCCESS", "A delayed transaction was completed"); - LogPerm("S:".$Transaction->getClient().":".$Transaction->getRequest()); + LogPerm("S:".$Socket->PeerLoncapaHim().":".$Transaction->getRequest()); unlink($Transaction->getFile()); } } @@ -788,7 +788,7 @@ is readable. The action is state depend =head3 State=Initialized -We're waiting for the challenge, this is a no-op until the +We are waiting for the challenge, this is a no-op until the state changes. =head3 State=Challenged @@ -986,9 +986,9 @@ event. The action taken is very state d =head3 State = Connected The connection is in the process of sending the 'init' hailing to the -lond on the remote end. The connection object's Writable member is -called. On error, ConnectionError is called to destroy the connection -and remove it from the ActiveConnections hash +lond on the remote end. The Writable member of the connection object +is called. On error, call ConnectionError to destroy the connection +and remove it from the ActiveConnections hash. =head3 Initialized @@ -2142,6 +2142,7 @@ sub UpdateKids { # (lost unless they are critical). &KillThemAll(); + LondConnection->ResetReadConfig(); } @@ -2157,6 +2158,7 @@ the config file. sub Restart { &KillThemAll; # First kill all the children. + LondConnection->ResetReadConfig(); Log("CRITICAL", "Restarting"); my $execdir = $perlvar{'lonDaemons'}; unlink("$execdir/logs/lonc.pid");