Changeset 533

Timestamp:

08/18/06 22:44:54 (4 years ago)

Author:

hachi

Message:

r18066@lj (orig r516): bradfitz | 2006-08-18 12:08:18 -0700
moving cache populating to method on service class

Location:

trunk/lib/Perlbal

Files:

• BackendHTTP.pm (modified) (1 diff)
• Service.pm (modified) (1 diff)

trunk/lib/Perlbal/BackendHTTP.pm

@@ -386 +386 @@
         return;
     } elsif ((my $urls = $hd->header('X-REPROXY-URL')) && $self->may_reproxy) {
-        my $res_headers = $self->{res_headers};
-
-        if (defined $reproxy_cache_for and my $reproxy_cache = $self->{service}->reproxy_cache) {
-            my ($timeout_delta, $cache_headers) = split ';', $reproxy_cache_for, 2;
-            my $timeout = $timeout_delta ? time + $timeout_delta : undef;
-
-            my $hostname = $client->{req_headers}->header("Host");
-            my $request = $client->{req_headers}->{requestLine};
-
-            $hostname = '' unless defined $hostname;
-            $request = '' unless defined $request;
-
-            my $key = "$hostname|$request";
-#            warn "Caching redirect in '$key'\n";
-
-            my @headers;
-            foreach my $header (split /\s+/, $cache_headers) {
-                next unless my $value = $res_headers->header($header);
-                $value = _ref_to($value) if uc($header) eq 'CONTENT-TYPE';
-                my $key = _ref_to($header);
-                push @headers, ($key, $value);
-            }
-#            warn "Code: $res_headers->{code} Headers: ", join( ",", @headers ), "\n";
-            $reproxy_cache->set($key, [$timeout, \@headers, $urls]);
-        }
-
+        $self->{service}->add_to_reproxy_url_cache($reproxy_cache_for, $hd)
+            if $reproxy_cache_for;
         $client->start_reproxy_uri($self->{res_headers}, $urls);
         $self->next_request;

trunk/lib/Perlbal/Service.pm

@@ -1383 +1383 @@
 }
 
+sub add_to_reproxy_url_cache {
+    my Perlbal::Service $self;
+    my ($self, $reshd) = @_;
+
+    my $reproxy_cache_for = $hd->header('X-REPROXY-CACHE-FOR');
+    my $urls              = $hd->header('X-REPROXY-URL');
+
+        if (defined $reproxy_cache_for and my $reproxy_cache = $self->{service}->reproxy_cache) {
+            my ($timeout_delta, $cache_headers) = split ';', $reproxy_cache_for, 2;
+            my $timeout = $timeout_delta ? time() + $timeout_delta : undef;
+
+            my $hostname = $client->{req_headers}->header("Host") || '';
+            my $requri   = $client->{req_headers}->request_uri    || '';
+            my $key = "$hostname|$requri";
+
+            my @headers;
+            foreach my $header (split /\s+/, $cache_headers) {
+                next unless my $value = $res_headers->header($header);
+                $value = _ref_to($value) if uc($header) eq 'CONTENT-TYPE';
+                my $key = _ref_to($header);
+                push @headers, ($key, $value);
+            }
+            $reproxy_cache->set($key, [$timeout, \@headers, $urls]);
+        }
+
+}
+
 1;