--- loncom/Attic/lonc 1999/11/18 19:52:46 1.3 +++ loncom/Attic/lonc 1999/12/22 17:18:04 1.4 @@ -11,7 +11,7 @@ # USR1 tries to open connections again # 6/4/99,6/5,6/7,6/8,6/9,6/10,6/11,6/12,7/14,7/19, -# 10/8,10/9,10/15,11/18 Gerd Kortemeyer +# 10/8,10/9,10/15,11/18,12/22 Gerd Kortemeyer # based on nonforker from Perl Cookbook # - server who multiplexes without forking @@ -31,6 +31,7 @@ open (CONFIG,"/etc/httpd/conf/access.con while ($configline=) { if ($configline =~ /PerlSetVar/) { my ($dummy,$varname,$varvalue)=split(/\s+/,$configline); + chomp($varvalue); $perlvar{$varname}=$varvalue; } } @@ -255,15 +256,20 @@ if ($cipher=new IDEA $cipherkey) { # ----------------------------------------- We're online, send delayed messages + my @allbuffered; my $path="$perlvar{'lonSockDir'}/delayed"; + opendir(DIRHANDLE,$path); + @allbuffered=grep /\.$conserver$/, readdir DIRHANDLE; + closedir(DIRHANDLE); my $dfname; - while ($dfname=<$path/*.$conserver>) { + map { + $dfname="$path/$_"; + &logthis($dfname); my $wcmd; { my $dfh=IO::File->new($dfname); - $wcmd=<$dfh>; + $cmd=<$dfh>; } - my ($server,$cmd)=split(/:/,$wcmd); chomp($cmd); my $bcmd=$cmd; if ($cmd =~ /^encrypt\:/) { @@ -285,10 +291,10 @@ if ($cipher=new IDEA $cipherkey) { chomp($answer); if ($answer ne '') { unlink("$dfname"); - &logthis("Delayed $cmd to $conserver ($server): >$answer<"); + &logthis("Delayed $cmd to $conserver: >$answer<"); &logperm("S:$conserver:$bcmd"); } - } + } @allbuffered; # ------------------------------------------------------- Listen to UNIX socket unless (