Revert "chore: tweaks at cache middleware"

This reverts commit 12cea6a.

Author: smarcet

app/Http/Middleware/CacheMiddleware.php

@@ -94,7 +94,7 @@ public function handle($request, Closure $next, $cache_lifetime, $cache_region =
 
         if ($regionTag) {
             Log::debug("CacheMiddleware: using region tag {$regionTag} ip {$ip} agent {$agent}");
-            // try L1
+            // try L1 APC
             $encoded = MemCache::get($key);
             $wasMemCacheHit = $encoded !== null;
             if($wasMemCacheHit){
@@ -124,14 +124,14 @@ public function handle($request, Closure $next, $cache_lifetime, $cache_region =
                     });
 
 
-                // backfill Memcache only if we actually have a value
+                // backfill APC only if we actually have a value
                 if ($encoded !== null) { // avoid null writes
                     MemCache::put($key, $encoded, $cache_lifetime, $regionTag);
                 }
             }
             $data = $this->decode($encoded);
         } else {
-            // try L1
+            // try L1 APC
             $encoded = MemCache::get($key);
             $wasMemCacheHit = !is_null($encoded);
             if($wasMemCacheHit){
@@ -157,7 +157,7 @@ public function handle($request, Closure $next, $cache_lifetime, $cache_region =
                     }
                     return Cache::get($key);
                 });
-                // store at MemCache
+                // store at APC
                 if ($encoded !== null) { // avoid null writes
                     MemCache::put($key, $encoded, $cache_lifetime);
                 }
@@ -177,8 +177,7 @@ public function handle($request, Closure $next, $cache_lifetime, $cache_region =
         $response->headers->addCacheControlDirective('must-revalidate', true);
         $response->headers->addCacheControlDirective('proxy-revalidate', true);
         $response->headers->add([
-            'X-Cache-Result' => ($wasMemCacheHit || $wasHit) ? 'HIT' : 'MISS',
-            'X-Cache-Type' =>  $wasMemCacheHit ? 'M' : ($wasHit ? 'R' : 'N'),
+            'X-Cache-Result' => $wasMemCacheHit ? 'HIT MemcCache' : ($wasHit ? 'HIT REDIS' : 'MISS'),
         ]);
         Log::debug( "CacheMiddleware: returning response", [
             'ip' => $ip,