perfsonar development work

Author: dfn.calim
Date: 2011-07-06 14:19:11 +0100 (Wed, 06 Jul 2011)
New Revision: 723

Modified:
   trunk/bin/oppd.pl
   trunk/etc/oppd-dev/oppd.dev.conf
   trunk/lib/perfSONAR.pm
Log:
fix bug in LS registration if no url is given but ls registration is on

Modified: trunk/bin/oppd.pl
===================================================================
--- trunk/bin/oppd.pl   2011-07-04 14:15:20 UTC (rev 722)
+++ trunk/bin/oppd.pl   2011-07-06 13:19:11 UTC (rev 723)
@@ -232,13 +232,14 @@
   pod2usage( { -message => "Invalid log level: $loglevel",
                -exitval => 2 } )  unless $log->level_is_valid($loglevel);
 }
-#$ls_url     = get_opt($ls_url,    $Config{ls_url},    "");
+@ls_url
 = ();
 #LS URL can be one or more, take care of that:
 my $ls_opt = $Config{ls_url};
 if(ref($ls_opt) eq "ARRAY"){
+  print "01\n";
   @ls_url = @{$ls_opt};
 } else {
-  @ls_url = ($ls_opt);
+  @ls_url = ($ls_opt) if defined $ls_opt;
 }
 $ls_register = get_opt($ls_register,  $Config{ls_register},   0);
 $keepalive  = get_opt($keepalive, $Config{keepalive},  3600);
@@ -629,7 +630,6 @@
 my $ls_reg_pid; # The pid of the LS registration process.
                 # "undef", if no such process running (at the moment).
 my $ls_reg_starttime = 0; # The time the registration process has started.
-                          # "0" is important for first start!
 my $ls_reg_respawn_threshold = 60; # Respawn threshold for registration 
process
 if ($ls_register){
   if 
(!@ls_url){
@@ -1056,7 +1056,9 @@
     
   # Start registration process
   #print Dumper(%services);
-  $services{"MP/LSToolreg"}->{handler}->run();
+  if ($services{"MP/LSToolreg"}){
+    $services{"MP/LSToolreg"}->{handler}->run();
+  }
   perfSONAR::Client::LS::init(services => \%services,
                                                        ls_url => 
\@ls_url,
                                                        hostname => 
$hostname, 

Modified: trunk/etc/oppd-dev/oppd.dev.conf
===================================================================
--- trunk/etc/oppd-dev/oppd.dev.conf    2011-07-04 14:15:20 UTC (rev 722)
+++ trunk/etc/oppd-dev/oppd.dev.conf    2011-07-06 13:19:11 UTC (rev 723)
@@ -244,8 +244,8 @@
 # ls_url         
"http://loco4.man.poznan.pl:8180/geant2-java-xml-ls/services/LookupService";
 #
 ls_url 
"http://ls.perfsonar.pionier.net.pl:8180/geant2-java-xml-ls/services/LookupService";
-ls_url "http://psmsu05.aglt2.org:9995/perfSONAR_PS/services/hLS";
-ls_url "http://bby-e-sonar.sfu.ca:8095/perfSONAR_PS/services/hLS";
+#ls_url        "http://psmsu05.aglt2.org:9995/perfSONAR_PS/services/hLS";
+#ls_url        "http://bby-e-sonar.sfu.ca:8095/perfSONAR_PS/services/hLS";
 #ls_url        
"http://perfmonc.cesnet.cz:8070/XML-LS-1.1.2/services/LookupService";
 #ls_url        
"http://ls.sonar.net.switch.ch:8180/XML-LS-1.1.1/services/LookupService";
 

Modified: trunk/lib/perfSONAR.pm
===================================================================
--- trunk/lib/perfSONAR.pm      2011-07-04 14:15:20 UTC (rev 722)
+++ trunk/lib/perfSONAR.pm      2011-07-06 13:19:11 UTC (rev 723)
@@ -159,4 +159,4 @@
   return $nmwg_message;
 }
 
-1;
\ No newline at end of file
+1;