version 1.121, 2003/03/27 23:00:28
|
version 1.126, 2003/05/06 21:36:42
|
Line 57 use LONCAPA::Configuration;
|
Line 57 use LONCAPA::Configuration;
|
|
|
use IO::Socket; |
use IO::Socket; |
use IO::File; |
use IO::File; |
use Apache::File; |
#use Apache::File; |
use Symbol; |
use Symbol; |
use POSIX; |
use POSIX; |
use Crypt::IDEA; |
use Crypt::IDEA; |
Line 375 sub reconlonc {
|
Line 375 sub reconlonc {
|
if (kill 0 => $loncpid) { |
if (kill 0 => $loncpid) { |
&logthis("lonc at pid $loncpid responding, sending USR1"); |
&logthis("lonc at pid $loncpid responding, sending USR1"); |
kill USR1 => $loncpid; |
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( |
|
"<font color=blue>WARNING: $peerfile still not there, giving up</font>"); |
|
} else { |
} else { |
&logthis( |
&logthis( |
"<font color=red>CRITICAL: " |
"<font color=red>CRITICAL: " |
Line 543 sub make_new_child {
|
Line 536 sub make_new_child {
|
} else { |
} else { |
# Child can *not* return from this subroutine. |
# Child can *not* return from this subroutine. |
$SIG{INT} = 'DEFAULT'; # make SIGINT kill us as it did before |
$SIG{INT} = 'DEFAULT'; # make SIGINT kill us as it did before |
|
$SIG{CHLD} = 'DEFAULT'; #make this default so that pwauth returns |
|
#don't get intercepted |
$SIG{USR1}= \&logstatus; |
$SIG{USR1}= \&logstatus; |
$SIG{ALRM}= \&timeout; |
$SIG{ALRM}= \&timeout; |
$lastlog='Forked '; |
$lastlog='Forked '; |
Line 1479 sub make_new_child {
|
Line 1474 sub make_new_child {
|
print $client "ok\n"; |
print $client "ok\n"; |
# -------------------------------------------------------------------- chatretr |
# -------------------------------------------------------------------- chatretr |
} elsif ($userinput =~ /^chatretr/) { |
} elsif ($userinput =~ /^chatretr/) { |
my ($cmd,$cdom,$cnum)=split(/\:/,$userinput); |
my |
|
($cmd,$cdom,$cnum,$udom,$uname)=split(/\:/,$userinput); |
my $reply=''; |
my $reply=''; |
foreach (&getchat($cdom,$cnum)) { |
foreach (&getchat($cdom,$cnum,$udom,$uname)) { |
$reply.=&escape($_).':'; |
$reply.=&escape($_).':'; |
} |
} |
$reply=~s/\:$//; |
$reply=~s/\:$//; |
Line 1833 sub addline {
|
Line 1829 sub addline {
|
} |
} |
|
|
sub getchat { |
sub getchat { |
my ($cdom,$cname)=@_; |
my ($cdom,$cname,$udom,$uname)=@_; |
my %hash; |
my %hash; |
my $proname=&propath($cdom,$cname); |
my $proname=&propath($cdom,$cname); |
my @entries=(); |
my @entries=(); |
Line 1842 sub getchat {
|
Line 1838 sub getchat {
|
@entries=map { $_.':'.$hash{$_} } sort keys %hash; |
@entries=map { $_.':'.$hash{$_} } sort keys %hash; |
untie %hash; |
untie %hash; |
} |
} |
return @entries; |
my @participants=(); |
|
$cutoff=time-60; |
|
if (tie(%hash,'GDBM_File',"$proname/nohist_inchatroom.db", |
|
&GDBM_WRCREAT(),0640)) { |
|
$hash{$uname.':'.$udom}=time; |
|
foreach (sort keys %hash) { |
|
if ($hash{$_}>$cutoff) { |
|
$participants[$#participants+1]='active_participant:'.$_; |
|
} |
|
} |
|
untie %hash; |
|
} |
|
return (@participants,@entries); |
} |
} |
|
|
sub chatadd { |
sub chatadd { |