--- loncom/lond 2003/03/28 20:40:52 1.123
+++ loncom/lond 2003/04/05 00:11:34 1.125
@@ -2,7 +2,7 @@
# The LearningOnline Network
# lond "LON Daemon" Server (port "LOND" 5663)
#
-# $Id: lond,v 1.123 2003/03/28 20:40:52 www Exp $
+# $Id: lond,v 1.125 2003/04/05 00:11:34 foxr Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -73,7 +73,7 @@ my $DEBUG = 0; # Non zero to ena
my $status='';
my $lastlog='';
-my $VERSION='$Revision: 1.123 $'; #' stupid emacs
+my $VERSION='$Revision: 1.125 $'; #' stupid emacs
my $remoteVERSION;
my $currenthostid;
my $currentdomainid;
@@ -375,13 +375,6 @@ sub reconlonc {
if (kill 0 => $loncpid) {
&logthis("lonc at pid $loncpid responding, sending USR1");
kill USR1 => $loncpid;
- sleep 5;
- if (-e "$peerfile") { return; }
- &logthis("$peerfile still not there, give it another try");
- sleep 10;
- if (-e "$peerfile") { return; }
- &logthis(
- "WARNING: $peerfile still not there, giving up");
} else {
&logthis(
"CRITICAL: "
@@ -1843,18 +1836,19 @@ sub getchat {
@entries=map { $_.':'.$hash{$_} } sort keys %hash;
untie %hash;
}
+ my @participants=();
$cutoff=time-60;
if (tie(%hash,'GDBM_File',"$proname/nohist_inchatroom.db",
- &GDBM_READER(),0640)) {
- $hash{$uname.':'.$undom}=time;
+ &GDBM_WRCREAT(),0640)) {
+ $hash{$uname.':'.$udom}=time;
foreach (sort keys %hash) {
if ($hash{$_}>$cutoff) {
- $entries[$#entries+1]='active_participant:'.$_;
+ $participants[$#participants+1]='active_participant:'.$_;
}
}
untie %hash;
}
- return @entries;
+ return (@participants,@entries);
}
sub chatadd {