Item8937: enhanced redirect cache debugging

git-svn-id: http://svn.foswiki.org/trunk@7324 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
foswiki · May 4, 2010 · d5177da · d5177da
1 parent ea8201d
commit d5177da
Showing 1 changed file with 27 additions and 13 deletions.
diff --git a/core/lib/Foswiki/Request/Cache.pm b/core/lib/Foswiki/Request/Cache.pm
@@ -80,17 +80,27 @@ sub save {
     # Serialize some key info from the request
     foreach my $field qw(method path_info action) {
         print $F $field,'=', ($req->$field() || ''), "\n";
-        print STDERR "Saving $field =" . $req->$field() || '' . "\n"
+        print STDERR "CACHE $uid> $field(" . ($req->$field() || '') . ")\n"
           if (TRACE_CACHE); 
     }
     print $F "=\n";
 
+    if (TRACE_CACHE) {
+        foreach my $name ( $req->param ) {
+            foreach my $value ( $req->param($name) ) {
+                $value = '' unless defined $value;
+                print STDERR "CACHE $uid> $name=$value\n";
+            }
+        }
+    }
+
     # Serialize the request parameters
     $req->save($F);
 
     # Serialize uploads, if there are any, and store the upload keys
     while ( my ($k, $v) = each %{ $req->{uploads} }) {
         $k = Foswiki::urlEncode($k);
+        print STDERR "CACHE $uid> upload $k\n";
         $this->_saveUpload( $this->_cacheFile($uid), $k, $v );
         print $F $k;
     }
@@ -118,43 +128,47 @@ sub load {
     # Read cached post parameters
     my $F = new IO::File($this->_cacheFile($uid), '<' );
     if ($F) {
-        if (TRACE_CACHE) {
-            print STDERR "ReqCache: Loading $uid\n";
-            #local $/;
-            #print STDERR <$F>, "\n";
-            #$F->seek( 0, 0 );
-        }
-
         # Load request fields
         local $/ = "\n";
         while (my $e = <$F>) {
             chomp($e);
             last if $e eq '=';
             my ($fn, $val) = split('=', $e, 2);
-            print STDERR "CACHE LOAD set $fn ( $val ) \n" if (TRACE_CACHE);
+            print STDERR "CACHE $uid< $fn($val)\n" if (TRACE_CACHE);
             $req->$fn($val);
         }
 
+        if (TRACE_CACHE) {
+            my $here = tell $F;
+            while (my $l = <$F>) {
+                last if $l =~ /^=/;
+                print STDERR "CACHE $uid< $l";
+            }
+            seek($F, $here, 0);
+        }
+
         # Load params
         $req->load($F);
 
         # Load uploads
         while (my $key = <$F>) {
             chomp($key);
-            $key = Foswiki::Sandbox::untaintUnchecked( $key );
-            $req->{uploads}->{Foswiki::urlDecode($key)} =
+            $key = Foswiki::urlDecode(
+                Foswiki::Sandbox::untaintUnchecked( $key ));
+            print STDERR "CACHE $uid< upload $key\n";
+            $req->{uploads}->{$key} =
               $this->_loadUpload( $this->_cacheFile($uid), $key );
         }
         # Load uploads
         unlink($this->_cacheFile($uid));
-        print STDERR "ReqCache: Loaded ".
+        print STDERR "CACHE $uid< Loaded ".
           $this->_cacheFile($uid).", URL now ".$req->url()."\n"
             if TRACE_CACHE;
 
     }
     else {
         # SMELL: should this be an assert?
-        print STDERR "ReqCache: Could not find ".$this->_cacheFile($uid)."\n"
+        print STDERR "CACHE $uid< Could not find ".$this->_cacheFile($uid)."\n"
           if TRACE_CACHE;
     }
 }