[LON-CAPA-cvs] cvs: loncom / lonsql

[albertel]

albertel		Tue Feb  7 17:30:32 2006 EDT

  Modified files:              
    /loncom	lonsql 
  Log:
  - &reply() needs to connect to the correct location
  
  
Index: loncom/lonsql
diff -u loncom/lonsql:1.71 loncom/lonsql:1.72
--- loncom/lonsql:1.71	Tue Feb  7 11:20:39 2006
+++ loncom/lonsql	Tue Feb  7 17:30:31 2006
@@ -3,7 +3,7 @@
 # The LearningOnline Network
 # lonsql - LON TCP-MySQL-Server Daemon for handling database requests.
 #
-# $Id: lonsql,v 1.71 2006/02/07 16:20:39 albertel Exp $
+# $Id: lonsql,v 1.72 2006/02/07 22:30:31 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -260,12 +260,14 @@
 # Read hosts file
 #
 my $thisserver;
+my %hostname;
 my $PREFORK=4; # number of children to maintain, at least four spare
 open (CONFIG,"$perlvar{'lonTabDir'}/hosts.tab") || die "Can't read host file";
 while (my $configline=<CONFIG>) {
     my ($id,$domain,$role,$name)=split(/:/,$configline);
     $name=~s/\s//g;
     $thisserver=$name if ($id eq $perlvar{'lonHostID'});
+    $hostname{$id}=$name;
     #$PREFORK++;
 }
 close(CONFIG);
@@ -658,12 +660,12 @@
 ########################################################
 sub subreply {
     my ($cmd,$server)=@_;
-    my $peerfile="$perlvar{'lonSockDir'}/$server";
+    my $peerfile="$perlvar{'lonSockDir'}/".$hostname{$server};
     my $sclient=IO::Socket::UNIX->new(Peer    =>"$peerfile",
                                       Type    => SOCK_STREAM,
                                       Timeout => 10)
        or return "con_lost";
-    print $sclient "$cmd\n";
+    print $sclient "sethost:$server:$cmd\n";
     my $answer=<$sclient>;
     chomp($answer);
     $answer="con_lost" if (!$answer);