Changeset ae5283c7e99faf2b995945c770a82f65747b3616

Timestamp:

03/23/07 13:54:07 (6 years ago)

Author:

Theo Schlossnagle <jesus@omniti.com>

git-committer:

Theo Schlossnagle <jesus@omniti.com> 1174658047 +0000

git-parent:

[8346efda0e37e40bff49471d4d54cbc63a58ba53]

git-author:

Theo Schlossnagle <jesus@omniti.com> 1174658047 +0000

Message:

add configuration to the XML dump

git-svn-id: https://labs.omniti.com/resmon/trunk@33 8c0face9-b7db-6ec6-c4b3-d5f7145c7d55

Files:

• lib/Resmon/Module.pm (modified) (1 diff)
• lib/Resmon/Status.pm (modified) (1 diff)
• resmon (modified) (1 diff)

lib/Resmon/Module.pm

@@ -62 +62 @@
-  }
-  return ($arg->{laststatus}, $arg->{lastmessage});
+}
+sub config_as_hash {
+  my $self = shift;
+  my $conf = {};
+  while(my ($key, $value) = each %$self) {
+    if(! ref $value) {
+      # only stash scalars here.
+      $conf->{$key} = $value;
+    }
+  }
+  return $conf;
-}
-#### Begin actual monitor functions ####

lib/Resmon/Status.pm

@@ -51 +51 @@
-  # unlock
-}
+sub xml_kv_dump {
+  my $info = shift;
+  my $indent = shift || 0;
+  my $rv = '';
+  while(my ($key, $value) = each %$info) {
+    $rv .= " " x $indent;
+    if(ref $value eq 'HASH') {
+      $rv .= "<$key>\n";
+      $rv .= xml_kv_dump($value, $indent + 2);
+      $rv .= " " x $indent;
+      $rv .= "</$key>\n";
+    }
+    else {
+      $rv .= "<$key>$value</$key>\n";
+    }
+  }
+  return $rv;
+}
-sub xml_info {
-  my ($module, $service, $info) = @_;
-  my $rv = '';
-  $rv .= "  <ResmonResult module=\"$module\" service=\"$service\">\n";
-
-
-
+
-  $rv .= "  </ResmonResult>\n";
-  return $rv;

resmon

@@ -78 +78 @@
-        eval { ($check_rv, $check_mess) = $monobj->handler(); };
-      }
-
+
+
+
+
-      if($@) {
-        $results->{state} = 'BAD';