svn commit: r1390697 - /vcl/trunk/managementnode/lib/VCL/healthcheck.pm

[fapeeler]

Author: fapeeler
Date: Wed Sep 26 19:47:19 2012
New Revision: 1390697

URL: http://svn.apache.org/viewvc?rev=1390697&view=rev
Log:
VCL-635

more minor tweaks


Modified:
    vcl/trunk/managementnode/lib/VCL/healthcheck.pm

Modified: vcl/trunk/managementnode/lib/VCL/healthcheck.pm
URL: 
http://svn.apache.org/viewvc/vcl/trunk/managementnode/lib/VCL/healthcheck.pm?rev=1390697&r1=1390696&r2=1390697&view=diff
==============================================================================
--- vcl/trunk/managementnode/lib/VCL/healthcheck.pm (original)
+++ vcl/trunk/managementnode/lib/VCL/healthcheck.pm Wed Sep 26 19:47:19 2012
@@ -228,8 +228,12 @@ sub process {
                my $computer_hostname             = 
$data->get_computer_host_name();
                my $computer_short_name                          = $1 if 
($computer_hostname =~ /([-_a-zA-Z0-9]*)(\.?)/);
                my $computer_type                 = $data->get_computer_type(); 
-               next if ($computer_type eq "lab");
-               next if($computer_type eq "blade");
+               
+               if ($computer_type eq "lab") {
+                       next;
+                       $computer_short_name = $computer_hostname;
+               }
+               #next if($computer_type eq "blade");
                #next if ($computer_type eq "virtualmachine");
 
                my %node_status;
@@ -251,7 +255,6 @@ sub process {
                        my $sshd_status = _sshd_status($computer_short_name);
                        if($sshd_status eq "on") { 
                                my @currentimage_txt_contents    = 
get_current_image_contents_noDS($computer_short_name);
-                               #notify($ERRORS{'OK'}, 0, "NODE 
$computer_short_name currentimage contents:\n @currentimage_txt_contents");
 
                                        foreach my $l 
(@currentimage_txt_contents) {
                                                #notify($ERRORS{'OK'}, 0, "NODE 
l=$l");
@@ -260,13 +263,12 @@ sub process {
                                                        chomp($l);
                                                        my 
($b,$imagerevision_id) = split(/=/,$l);
                                                        
$node_status{imagerevision_id} = $imagerevision_id;
-                                                       #notify($ERRORS{'OK'}, 
0, " b=$b imagerevision_id=  $imagerevision_id");
                                                        $node_status_string = 
"post_load";
                                                        $node_status{status} = 
"post_load";
-                                                       if ($l =~ 
/vcld_post_load/i ) {
+                                               }
+                                               if ($l =~ /vcld_post_load/ ) {
                                                                
$node_status_string = "ready";
                                                                
$node_status{status} = "ready";
-                                                       }
                                                }
                                        }
                                        
@@ -281,10 +283,8 @@ sub process {
                                        }
                        }
 
-               #       notify($ERRORS{'OK'}, 0, "NODE $computer_short_name 
node_status contents:\n  imagerevision_id= $node_status{imagerevision_id} 
currentimage $node_status{currentimage} current_image_id= 
$node_status{current_image_id} imagerevision_id= $node_status{imagerevision_id} 
");
                }
 
-
                #need to pass some of the management node info to provisioing 
module node_status
                $info->{computertable}->{$cid}->{"managementnode"} = 
$info->{managementnode};
                $info->{computertable}->{$cid}->{"logfile"}        = 
$info->{logfile};