Merge branch 'master' of git.gnu.io:gnu/gnu-social

[quix0rs-gnu-social.git] / scripts / imdaemon.php

diff --git a/scripts/imdaemon.php b/scripts/imdaemon.php
index 4a2c942234f6112d19f017aaf64e1de61fcfdbff..0298c00522b52b9d3d2d0dd3c4324a1fb7ae13bf 100755 (executable)
--- a/scripts/imdaemon.php
+++ b/scripts/imdaemon.php
@@ -53,7 +53,7 @@ class ImDaemon extends SpawningDaemon
     {
         common_log(LOG_INFO, 'Waiting to listen to IM connections and queues');
 
-        $master = new ImMaster($this->get_id());
+        $master = new ImMaster($this->get_id(), $this->processManager());
         $master->init($this->allsites);
         $master->service();
 
@@ -66,6 +66,14 @@ class ImDaemon extends SpawningDaemon
 
 class ImMaster extends IoMaster
 {
+    protected $processManager;
+
+    function __construct($id, $processManager)
+    {
+        parent::__construct($id);
+        $this->processManager = $processManager;
+    }
+
     /**
      * Initialize IoManagers for the currently configured site
      * which are appropriate to this instance.
@@ -77,6 +85,7 @@ class ImMaster extends IoMaster
             $qm = QueueManager::get();
             $qm->setActiveGroup('im');
             $classes[] = $qm;
+            $classes[] = $this->processManager;
         }
         Event::handle('EndImDaemonIoManagers', array(&$classes));
         foreach ($classes as $class) {