Run coroutines thread-safely (#26)

denismakogon · web-flow · commit f7e4614d4362 · 2018-03-07T11:25:31.000+02:00
diff --git a/fdk/runner.py b/fdk/runner.py
@@ -32,7 +32,8 @@ def handle_callable(ctx, handle_func, data=None,
     if isinstance(r, types.CoroutineType):
         print("function appeared to be a coroutine, awaiting...",
               file=sys.stderr, flush=True)
-        return loop.run_until_complete(r)
+        while not loop.is_running():
+            return loop.run_until_complete(r)
 
     return r
 
@@ -107,3 +108,4 @@ def data_received(self, data):
     def connection_lost(self, exc):
         print('pipe closed', file=sys.stderr, flush=True)
         super(JSONProtocol, self).connection_lost(exc)
+        sys.exit(0)
diff --git a/fdk/tests/test_json.py b/fdk/tests/test_json.py
@@ -84,3 +84,15 @@ def test_corotuine_func(self):
         self.assertIsNotNone(r)
         self.assertEqual(200, r.status())
         self.assertIn("OK", r.body())
+
+    def test_corotuine_func_multiple(self):
+        asyncio.set_event_loop_policy(uvloop.EventLoopPolicy())
+        loop = asyncio.get_event_loop()
+        in_bytes = data.raw_request_without_body.encode('utf8')
+        # simulates two requests handled by the coroutines
+        r1 = runner.handle_request(coroutine_func, in_bytes, loop=loop)
+        r2 = runner.handle_request(coroutine_func, in_bytes, loop=loop)
+        for r in [r1, r2]:
+            self.assertIsNotNone(r)
+            self.assertEqual(200, r.status())
+            self.assertIn("OK", r.body())
