Changeset c43001e8e3ac31dae3bfc11c22a72d78347fda07

Timestamp:

03/22/07 19:53:21 (12 years ago)

Author:

Theo Schlossnagle <jesus@omniti.com>

git-committer:

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

git-parent:

[e5d09e81c6b6816e904b241f852e542e067c2d4c]

git-author:

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

Message:

working web server and shared updated state

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

Files:

• lib/Resmon/Config.pm (modified) (1 diff)
• lib/Resmon/Status.pm (modified) (6 diffs)

lib/Resmon/Config.pm

@@ -37 +37 @@
-        next;
-      }
-?
+
-        eval "use lib '$1';";
-        next;
-      }
-?
+
-        $self->{interval} = $1;
-        next;
-      }
-?
+
-        $self->{statusfile} = $1;
-        next;

lib/Resmon/Status.pm

@@ -32 +32 @@
-  shmread($self->{shared_state}, $blob, length(pack('i', 0)), $len);
-  # unlock
-
-
+
+
+
+
-  return $self->{store};
-}
@@ -43 +45 @@
-  # Lock shared segment
-  # Write state and flush
-"l"
+'i'
-           0, length(pack('i', 0))) || die "$!";
-  shmwrite($self->{shared_state}, $blob, length(pack('i', 0)),
- - length(pack('i', 0))
+
-  # unlock
+}
+sub xml_info {
+  my ($module, $service, $info) = @_;
+  my $rv = '';
+  $rv .= "  <ResmonResult module=\"$module\" service=\"$service\">\n";
+  while(my ($key, $value) = each %$info) {
+    $rv .= "    <$key>$value</$key>\n";
+  }
+  $rv .= "  </ResmonResult>\n";
+  return $rv;
+}
+sub dump_generic {
+  my $self = shift;
+  my $dumper = shift;
+  my $rv = '';
+  while(my ($module, $services) = each %{$self->{store}}) {
+    while(my ($service, $info) = each %$services) {
+      $rv .= $dumper->($module,$service,$info);
+    }
+  }
+  return $rv;
+}
+sub dump_oldstyle {
+  my $self = shift;
+  my $response = $self->dump_generic(sub {
+    my($module,$service,$info) = @_;
+    return "$service($module) :: $info->{state}($info->{message})\n";
+  });
+  return $response;
+}
+sub dump_xml {
+  my $self = shift;
+  my $response = <<EOF
+<?xml version="1.0" encoding="UTF-8"?>
+<ResmonResults>
+EOF
+  ; 
+  $response .= $self->dump_generic(\&xml_info);
+  $response .= "</ResmonResults>\n";
+  return $response;
-}
-sub service {
@@ -53 +95 @@
-  my ($client, $req, $proto) = @_;
-  my $state = $self->get_shared_state();
- or $req eq '/status.txt'
-= Dumper($self->{store}
-length($response)) if($proto
+
+.= $self->dump_xml(
+$proto?length($response):0
-    print $client $response . "\r\n";
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-sub http_header {
-  my $code = shift;
-  my $len = shift;
+  my $type = shift || 'text/xml';
-  return qq^HTTP/1.0 $code OK
-Server: resmon
-^ . (defined($len) ? "Content-length: $len" : "Connection: close") . q^
-
+; charset=utf-8
-
-^;
@@ -98 +162 @@
-            s/\r\n/\n/g;
-            chomp;
-print "CLIENT <= $_\n";
-            if(!$req) {
- \s*HTTP\/(0\.9|1\.0|1\.1)\s*
+\s*?(?: HTTP\/(0\.9|1\.0|1\.1)\s*)?
-                $req = $1;
-                $proto = $2;
-              }
-              elsif(/^GET \s*(\S+)\s*$/) {
-                $req = $1;
-                $proto = undef;
-              }
-              else {
@@ -114 +173 @@
-            elsif(/^$/) {
-              $self->service($client, $req, $proto);
+              last unless ($proto);
-              $req = undef;
-              $proto = undef;
@@ -125 +185 @@
-          };
-          if($@) {
-
-
+, 0, 'text/plain'
+\r\n
-            last;
-          }