issue #547: fix service_test failures.

Author: dw

mitogen/core.py

@@ -3524,7 +3524,8 @@ def _init_service_pool(self):
     def _dispatch_calls(self):
         for msg in self.recv:
             if msg.handle == STUB_CALL_SERVICE:
-                self._init_service_pool()
+                if msg.src_id == mitogen.context_id:
+                    self._init_service_pool()
                 continue
 
             chain_id, ret = self._dispatch_one(msg)

mitogen/service.py

@@ -496,15 +496,12 @@ def __init__(self, router, services=(), size=1, overwrite=False,
         self.router = router
         self._activator = self.activator_class()
         self._ipc_latch = mitogen.core.Latch()
-        self._receiver = recv or mitogen.core.Receiver(
+        self._receiver = mitogen.core.Receiver(
             router=router,
             handle=mitogen.core.CALL_SERVICE,
             overwrite=overwrite,
         )
 
-        # If self._receiver was inherited from mitogen.core.Dispatcher, we must
-        # remove its stub notification function before adding it to our Select.
-        self._receiver.notify = None
         self._select = mitogen.select.Select(oneshot=False)
         self._select.add(self._receiver)
         self._select.add(self._ipc_latch)
@@ -516,6 +513,16 @@ def __init__(self, router, services=(), size=1, overwrite=False,
         }
         self._invoker_by_name = {}
 
+        if recv is not None:
+            # When inheriting from mitogen.core.Dispatcher, we must remove its
+            # stub notification function before adding it to our Select. We
+            # always overwrite this receiver since the standard service.Pool
+            # handler policy differs from the one inherited from
+            # core.Dispatcher.
+            recv.notify = None
+            self._select.add(recv)
+            self._func_by_source[recv] = self._on_service_call
+
         for service in services:
             self.add(service)
         self._py_24_25_compat()