--- loncom/loncnew 2018/09/02 15:57:16 1.100.10.1 +++ loncom/loncnew 2017/02/28 05:42:06 1.101 @@ -2,7 +2,7 @@ # The LearningOnline Network with CAPA # lonc maintains the connections to remote computers # -# $Id: loncnew,v 1.100.10.1 2018/09/02 15:57:16 raeburn Exp $ +# $Id: loncnew,v 1.101 2017/02/28 05:42:06 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:".$Socket->PeerLoncapaHim().":".$Transaction->getRequest()); + LogPerm("S:".$Transaction->getClient().":".$Transaction->getRequest()); unlink($Transaction->getFile()); } } @@ -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"); @@ -2233,8 +2235,8 @@ sub Terminate { } sub my_hostname { - use Sys::Hostname::FQDN(); - my $name = Sys::Hostname::FQDN::fqdn(); + use Sys::Hostname; + my $name = &hostname(); &Debug(9,"Name is $name"); return $name; }