loncom/loncnew - diff

Return to loncnew CVS log

Up to [LON-CAPA] / loncom

-version 1.74, 2006/01/27 20:37:12
+version 1.75, 2006/07/19 19:56:26
  Line 1164  sub QueueDelayed {
      Debug(4, "Delayed path: ".$path);
      opendir(DIRHANDLE, $path);
-     my @alldelayed = grep /\.$RemoteHost$/, readdir DIRHANDLE;
+     my @all_host_ids;
+     my $host_iterator =   &LondConnection::GetHostIterator();
+     while (!$host_iterator->end()) {
+ 	my ($host_id,$host_name) = @{$host_iterator->get()}[0,3];
+ 	if ($host_name eq $RemoteHost) {
+ 	    push(@all_host_ids, $host_id);
+ 	}
+ 	$host_iterator->next();
+     }
+     my $host_id_re = '(?:'.join('|',@all_host_ids).')';
+     my @alldelayed = grep(/\.$host_id_re$/, readdir(DIRHANDLE));
      closedir(DIRHANDLE);
-     my $dfname;
+     foreach my $dfname (sort(@alldelayed)) {
-     my $reqfile;
+ 	my $reqfile = "$path/$dfname";
-     foreach $dfname (sort  @alldelayed) {
+ 	my ($host_id) = ($dfname =~ /\.([^.]*)$/);
- 	$reqfile = "$path/$dfname";
+ 	Debug(4, "queueing ".$reqfile." for $host_id");
- 	Debug(4, "queueing ".$reqfile);
  	my $Handle = IO::File->new($reqfile);
  	my $cmd    = <$Handle>;
  	chomp $cmd;		# There may or may not be a newline...
  	$cmd = $cmd."\n";	# now for sure there's exactly one newline.
- 	my $Transaction = LondTransaction->new($cmd);
+ 	my $Transaction = LondTransaction->new("sethost:$host_id:$cmd");
  	$Transaction->SetDeferred($reqfile);
  	QueueTransaction($Transaction);
      }