Changeset 17972

Timestamp:

10/06/08 15:37:50 (2 months ago)

Author:

rambo

Message:

forward port r17971

Files:

• trunk/midcom/midcom.core/midcom/application.php (modified) (2 diffs)
• trunk/midcom/midcom.core/midcom/services/cache/module/content.php (modified) (1 diff)

trunk/midcom/midcom.core/midcom/application.php

@@ -711 +711 @@
-        $this->_status = MIDCOM_STATUS_CLEANUP;
-
+        // Shutdown content-cache (ie flush content to user :) before possibly slow DBA watches
+        // done this way since it's slightly less hacky than calling shutdown and then mucking about with the cache->_modules etc 
+        $this->cache->content->_finish_caching();
+
-        $this->componentloader->process_pending_notifies();
-
@@ -728 +732 @@
-        }
-
+        // Shutdown rest of the caches
-        $this->cache->shutdown();
-

trunk/midcom/midcom.core/midcom/services/cache/module/content.php

@@ -943 +943 @@
-    function _finish_caching($etag=null)
-    {
+        // make it safe to call this multiple times
+        // done this way since it's slightly less hacky than mucking about with the cache->_modules etc 
+        static $run_count = 0;
+        ++$run_count;
+        if ($run_count > 1)
+        {
+            return;
+        }
+
-        if (   $this->_no_cache
-            || $this->_live_mode)