diff options
author | Brion Vibber <brion@pobox.com> | 2010-02-16 09:22:02 -0800 |
---|---|---|
committer | Brion Vibber <brion@pobox.com> | 2010-02-16 09:22:02 -0800 |
commit | 81b6b58e33f55054b7e5dd546f06dbdb5696ed92 (patch) | |
tree | 7dddea4daac884f70d021fb11f1d02d560c0cd10 /lib/dbqueuemanager.php | |
parent | 2e258454f396af9f95092b9564eee08179ff6be1 (diff) | |
parent | c74aea589d5a79d7048470d44e457dffc8919ad3 (diff) |
Merge branch 'master' into testing
Conflicts:
lib/stompqueuemanager.php
Diffstat (limited to 'lib/dbqueuemanager.php')
-rw-r--r-- | lib/dbqueuemanager.php | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/lib/dbqueuemanager.php b/lib/dbqueuemanager.php index c6350fc66..3032e4ec7 100644 --- a/lib/dbqueuemanager.php +++ b/lib/dbqueuemanager.php @@ -72,7 +72,7 @@ class DBQueueManager extends QueueManager public function poll() { $this->_log(LOG_DEBUG, 'Checking for notices...'); - $qi = Queue_item::top($this->getQueues()); + $qi = Queue_item::top($this->activeQueues()); if (empty($qi)) { $this->_log(LOG_DEBUG, 'No notices waiting; idling.'); return false; @@ -142,9 +142,4 @@ class DBQueueManager extends QueueManager $this->stats('error', $queue); } - - protected function _log($level, $msg) - { - common_log($level, 'DBQueueManager: '.$msg); - } } |