--- loncom/lond 2002/03/03 19:49:00 1.74
+++ loncom/lond 2002/03/28 04:27:42 1.76
@@ -2,7 +2,7 @@
# The LearningOnline Network
# lond "LON Daemon" Server (port "LOND" 5663)
#
-# $Id: lond,v 1.74 2002/03/03 19:49:00 harris41 Exp $
+# $Id: lond,v 1.76 2002/03/28 04:27:42 foxr Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -160,7 +160,7 @@ $server = IO::Socket::INET->new(LocalPor
# global variables
-$MAX_CLIENTS_PER_CHILD = 5; # number of clients each child should
+$MAX_CLIENTS_PER_CHILD = 50; # number of clients each child should
# process
%children = (); # keys are current child process IDs
$children = 0; # current number of children
@@ -301,10 +301,10 @@ sub reconlonc {
if (kill 0 => $loncpid) {
&logthis("lonc at pid $loncpid responding, sending USR1");
kill USR1 => $loncpid;
- sleep 1;
+ sleep 5;
if (-e "$peerfile") { return; }
&logthis("$peerfile still not there, give it another try");
- sleep 5;
+ sleep 10;
if (-e "$peerfile") { return; }
&logthis(
"WARNING: $peerfile still not there, giving up");
@@ -342,6 +342,7 @@ sub reply {
if ($answer eq 'con_lost') {
$answer=subreply("ping",$server);
if ($answer ne $server) {
+ &logthis("sub reply: answer != server");
&reconlonc("$perlvar{'lonSockDir'}/$server");
}
$answer=subreply($cmd,$server);
@@ -531,6 +532,7 @@ sub make_new_child {
}
if ($clientok) {
# ---------------- New known client connecting, could mean machine online again
+
&reconlonc("$perlvar{'lonSockDir'}/$hostid{$clientip}");
&logthis(
"Established connection: $hostid{$clientip}");
@@ -554,8 +556,9 @@ sub make_new_child {
}
$userinput=substr($userinput,0,$cmdlength);
$wasenc=1;
- }
}
+ }
+
# ------------------------------------------------------------- Normal commands
# ------------------------------------------------------------------------ ping
if ($userinput =~ /^ping/) {
@@ -1421,12 +1424,13 @@ sub make_new_child {
$client->close();
&logthis("WARNING: "
."Rejected client $clientip, closing connection");
- }
- &logthis("CRITICAL: "
- ."Disconnect from $clientip ($hostid{$clientip})");
+ }
+ }
+
# =============================================================================
- }
-
+
+ &logthis("CRITICAL: "
+ ."Disconnect from $clientip ($hostid{$clientip})");
# tidy up gracefully and finish
$server->close();