Changeset 16744

Timestamp:

06/30/08 16:46:39 (3 months ago)

Author:

rambo

Message:

forward port r16742 & r16743

Files:

• trunk/midcom/midcom.helper.replicator/queuemanager.php (modified) (4 diffs)

trunk/midcom/midcom.helper.replicator/queuemanager.php

@@ -13 +13 @@
-class midcom_helper_replicator_queuemanager extends midcom_baseclasses_components_purecode
-{
+    var $max_queues_per_pass = 10;
-    var $exporters = array();
-    var $transporters = array();
@@ -675 +676 @@
-        while (($queue_name = readdir($dp_queues)) !== false)
-        {
+            // limit the amount of queues we process per subscription per request
-            $queues[$queue_name] = $queue_name;
-        }
-        closedir($dp_queues);
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-        foreach ($queues as $queue_name)
-        {
+            // Limit the amount of queues we process per request to avoid leaking memory
+            ++$i;
+            if ($i > $this->max_queues_per_pass)
+            {
+                debug_push_class(__CLASS__, __FUNCTION__);
+                debug_add("Queue limit of {$this->max_queues_per_pass} reached, breaking out of loop.", MIDCOM_LOG_INFO);
+                debug_pop();
+                break;
+            }
-            if ($this->_process_queue_queuepath($queue_name, $subscription_path, $subscription) === false)
-            {
@@ -764 +784 @@
-    function safe_sg_name($sitegroup = null)
-    {
+        static $sg_obj_cache = array();
-        if (is_null($sitegroup))
-        {
@@ -773 +794 @@
-            return 'sg0';
-        }
-
-
+
+
+
+
+
-        if (   !is_object($sg)
-            || empty($sg->name))