Merge pull request #90 from LanceMaverick/api-beard

Api beard

main.py

@@ -74,8 +74,8 @@ def delegator_beard_gen(beards):
 
 def main(config):
 
-    if pyconfig.get('start_server'):
-        from skybeard import server
+    # if pyconfig.get('start_server'):
+    #     from skybeard import server
 
     if config.beards == "all":
         beards_to_load = all_possible_beards(config.beard_paths)
@@ -126,14 +126,34 @@ def main(config):
         list(delegator_beard_gen(Beard.beards))
     )
 
-    if pyconfig.get('start_server'):
-        asyncio.ensure_future(server.start())
-
     loop = asyncio.get_event_loop()
     loop.create_task(bot.message_loop())
-    print('Listening ...')
 
-    loop.run_forever()
+    if pyconfig.get('start_server'):
+        from skybeard.server import app
+
+        handler = app.make_handler()
+        f = loop.create_server(handler, '0.0.0.0', 8080)
+        srv = loop.run_until_complete(f)
+        print('serving on', srv.sockets[0].getsockname())
+
+    try:
+        print('Listening ...')
+        loop.run_forever()
+    except KeyboardInterrupt:
+        pass
+    finally:
+        if pyconfig.get('start_server'):
+            srv.close()
+            loop.run_until_complete(srv.wait_closed())
+            loop.run_until_complete(app.shutdown())
+            loop.run_until_complete(handler.shutdown(60.0))
+            loop.run_until_complete(app.cleanup())
+        loop.close()
+
+    # print('Listening ...')
+
+    # loop.run_forever()
 
 
 if __name__ == '__main__':

skybeard/server.py

@@ -0,0 +1,22 @@
+from aiohttp import web
+from functools import wraps, partial
+
+app = web.Application()
+
+
+def async_get(endpoint_or_fn, endpoint=None):
+    if isinstance(endpoint_or_fn, str):
+        return partial(async_get, endpoint=endpoint_or_fn)
+
+    ret_func = wraps(endpoint_or_fn)(endpoint_or_fn)
+
+    app.router.add_get(endpoint, ret_func)
+
+    return ret_func
+
+
+@async_get('/')
+async def hello(request):
+    return web.json_response({"text": "Hello, world"})
+
+# app.router.add_get('/', hello)