perfsonar development work

Author: dfn.calim
Date: 2011-11-10 15:16:31 +0000 (Thu, 10 Nov 2011)
New Revision: 745

Modified:
   branches/perfsonar-oppd-all-0.53/lib/perfSONAR/MP/LSToolreg.pm
Log:
bug fix in lstoolreg problem with conf file

Modified: branches/perfsonar-oppd-all-0.53/lib/perfSONAR/MP/LSToolreg.pm
===================================================================
--- branches/perfsonar-oppd-all-0.53/lib/perfSONAR/MP/LSToolreg.pm      
2011-11-10 14:08:47 UTC (rev 744)
+++ branches/perfsonar-oppd-all-0.53/lib/perfSONAR/MP/LSToolreg.pm      
2011-11-10 15:16:31 UTC (rev 745)
@@ -69,9 +69,8 @@
                        $self->{MODPARAM}->{$tool}->{REGTOOL} = "yes";        
          
                        
                        #read conf file for information
-                       my $confdir = $self->{MODPARAM}->{$tool}->{'confdir'};
-                       if ($confdir){
-                               my $conffile = $confdir . "/" . $tool . 
".conf";
+                       my $conffile = 
$self->{MODPARAM}->{$tool}->{'conffile'};
+                       if ($conffile){
                                $self->{LOGGER}->info("Opening: $conffile");
                                my $conf = new Config::General($conffile);
                                my %config = $conf->getall;
@@ -102,8 +101,15 @@
                                $self->{LOGGER}->warn("Cant open or find 
config filel");
                        }                       
                }else{
-                       $self->{MODPARAM}->{$tool}->{REGTOOL} = "no";
-                       $self->{LOGGER}->warn("Tool: $tool is not running not 
registering tool");
+                       #no conf file given get source node fron 
lstoolreg.conf
+                       my @srcnode  = split(/:/, 
$self->{MODPARAM}->{$tool}->{'conffile'});
+                       if ($srcnode[0] && $srcnode[1]){
+                               $self->{MODPARAM}->{$tool}->{'host'} = 
$srcnode[0];
+                               $self->{MODPARAM}->{$tool}->{'port'} = 
$srcnode[1];
+                       }else{
+                               $self->{MODPARAM}->{$tool}->{REGTOOL} = "no";
+                               $self->{LOGGER}->warn("Tool: $tool is not 
running not registering tool");
+                       }
                }
        }