[svn:p5ee] r10147 - p5ee/trunk/App-Context/lib/App/Context/POE

Author: spadkins
Date: Thu Nov  1 06:07:36 2007
New Revision: 10147

Modified:
   p5ee/trunk/App-Context/lib/App/Context/POE/ClusterController.pm
   p5ee/trunk/App-Context/lib/App/Context/POE/ClusterNode.pm

Log:
cosmetic changes mostly to the state view (added system load, estimated load, node up time and node last update time, request priority)

Modified: p5ee/trunk/App-Context/lib/App/Context/POE/ClusterController.pm
==============================================================================
--- p5ee/trunk/App-Context/lib/App/Context/POE/ClusterController.pm	(original)
+++ p5ee/trunk/App-Context/lib/App/Context/POE/ClusterController.pm	Thu Nov  1 06:07:36 2007
@@ -217,7 +217,7 @@
     my ($self, $kernel, $args) = @_[OBJECT, KERNEL, ARG0];
     my ($node, $sys_info) = @$args;
     $self->log("POE: poe_receive_node_status ($node) - " .
-               "load=$sys_info->{load}, " .
+               "load=$sys_info->{system_load}, " .
                "memfree=$sys_info->{memfree}/$sys_info->{memtotal} " .
                "swapfree=$sys_info->{swapfree}/$sys_info->{swaptotal}\n") if $self->{options}{poe_trace};
     $self->set_node_up($node, $sys_info);
@@ -267,15 +267,17 @@
     my ($memfree, $memtotal, $swapfree, $swaptotal);
     foreach my $node (sort keys %{$self->{node}}) {
         next if ($node eq "ALL");
-        $state .= sprintf("   %-16s %4s : %3d/%3d max : [Load:%4.1f][Mem:%5.1f%%/%7d][Swap:%5.1f%%/%7d] : [%19s]\n", $node,
+        $state .= sprintf("   %-16s %4s : %3d/%3d max : [Load:%4.1f][System Load:%4.1f][Mem:%5.1f%%/%7d][Swap:%5.1f%%/%7d] : [Up:%19s][Last:%19s]\n", $node,
             $self->{node}{$node}{up} ? "UP" : "down",
             $self->{node}{$node}{num_async_events} || 0,
             $self->{node}{$node}{max_async_events} || 0,
             $self->{node}{$node}{load} || 0,
+            $self->{node}{$node}{system_load} || 0,
             $self->{node}{$node}{memtotal} ? 100*($self->{node}{$node}{memtotal} - $self->{node}{$node}{memfree})/$self->{node}{$node}{memtotal} : 0,
             $self->{node}{$node}{memtotal} || 0,
             $self->{node}{$node}{swaptotal} ? 100*($self->{node}{$node}{swaptotal} - $self->{node}{$node}{swapfree})/$self->{node}{$node}{swaptotal} : 0,
             $self->{node}{$node}{swaptotal} || 0,
+            $self->{node}{$node}{up_datetime},
             $self->{node}{$node}{datetime});
     }
 
@@ -290,7 +292,7 @@
     my ($self, $node, $sys_info) = @_;
     my ($retval);
     if (!$self->{node}{$node}{up}) {
-        $self->{node}{$node}{datetime} = time2str("%Y-%m-%d %H:%M:%S", time());
+        $self->{node}{$node}{up_datetime} = time2str("%Y-%m-%d %H:%M:%S", time());
         if ($self->{node}{$node}{up}) {
             $retval = "ok";
         }
@@ -301,6 +303,7 @@
         }
     }
     if ($sys_info) {
+        $self->{node}{$node}{datetime} = time2str("%Y-%m-%d %H:%M:%S", time());
         foreach my $sys_var (keys %$sys_info) {
             $self->{node}{$node}{$sys_var} = $sys_info->{$sys_var};
         }

Modified: p5ee/trunk/App-Context/lib/App/Context/POE/ClusterNode.pm
==============================================================================
--- p5ee/trunk/App-Context/lib/App/Context/POE/ClusterNode.pm	(original)
+++ p5ee/trunk/App-Context/lib/App/Context/POE/ClusterNode.pm	Thu Nov  1 06:07:36 2007
@@ -196,10 +196,12 @@
     my $memfree = $sys_info->{memfree} + $sys_info->{buffers} + $sys_info->{cached};
     my $s_info = {
         load => $sys_info->{load},
+        system_load => $sys_info->{load},
         memfree => $memfree,
         memtotal => $sys_info->{memtotal},
         swapfree => $sys_info->{swapfree},
         swaptotal => $sys_info->{swaptotal},
+        max_async_events => $self->{max_async_events}
     };
 
     if ($self->{controller_up}) {