Changeset 1c2d107ca45fd019c7ef543e43e97ecabe5698f7

Timestamp:

06/26/07 14:36:01 (6 years ago)

Author:

Theo Schlossnagle <jesus@omniti.com>

git-committer:

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

git-parent:

[83e87ae54d050ecbfa3d34da8e727c259c3618da]

git-author:

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

Message:

redo this to obey correct keep-alive semantics

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

Files:

• lib/Resmon/Status.pm (modified) (5 diffs)

lib/Resmon/Status.pm

@@ -12 +12 @@
-
-my $SEGSIZE = 1024*256;
+my $KEEPALIVE_TIMEOUT = 5;
+my $REQUEST_TIMEOUT = 60;
-sub new {
-  my $class = shift;
@@ -107 +109 @@
-sub service {
-  my $self = shift;
-
+, $snip
-  my $state = $self->get_shared_state();
-  if($req eq '/' or $req eq '/status') {
-    my $response .= $self->dump_xml();
-$proto?length($response):0
+length($response), 'text/xml', $snip
-    $client->print($response . "\r\n");
-    return;
-  } elsif($req eq '/status.txt') {
-    my $response = $self->dump_oldstyle();
-$proto?length($response):0, 'text/plain'
+length($response), 'text/plain', $snip
-    $client->print($response . "\r\n");
-    return;
@@ -128 +130 @@
-                     xml_info($1,$2,$info).
-                     "</ResmonRestults>\n";
-$proto?length($response):0
+length($response), 'text/xml', $snip
-        $client->print( $response . "\r\n");
-        return;
@@ -140 +142 @@
-  my $len = shift;
-  my $type = shift || 'text/xml';
+  my $close_connection = shift || 1;
-  return qq^HTTP/1.0 $code OK
-Server: resmon
-
-
+
+
+
-
-^;
@@ -180 +184 @@
-        my $req;
-        my $proto;
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-              }
-              else {
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-              }
+            };
+            if($@) {
+              print $client http_header(500, 0, 'text/plain', 1);
+              print $client "$@\r\n";
+              last;
-            }
-            elsif(/^$/) {
-              $self->service($client, $req, $proto);
-              last unless ($proto);
-              $req = undef;
-              $proto = undef;
-            }
-            elsif(/^\S+\s*:\s*.{1,4096}$/) {
-              # Valid request header... noop
-            }
-            else {
-              die "protocol deviations.\n";
-            }
-          };
-          if($@) {
-            print $client http_header(500, 0, 'text/plain');
-            print $client "$@\r\n";
-            last;
-          }
-
+;
-        $client->close();
-      }