add logger

sanicms/server.py

@@ -37,7 +37,7 @@
 async def before_server_start(app, loop):
     queue = asyncio.Queue()
     app.queue = queue
-    loop.create_task(consume(queue, app.config['ZIPKIN_SERVER']))
+    loop.create_task(consume(queue, app))
     loop.create_task(service_watcher(app, loop))
     reporter = AioReporter(queue=queue)
     tracer = BasicTracer(recorder=reporter)
@@ -57,7 +57,7 @@ async def after_server_start(app, loop):
     service = ServiceManager(app.name, loop=loop, host=app.config['CONSUL_AGENT_HOST'])
     await service.register_service(app.config['PORT'])
     app.service = service
-       
+
 
 @app.listener('before_server_stop')
 async def before_server_stop(app, loop):

sanicms/service.py

@@ -7,6 +7,8 @@
 
 from collections import defaultdict
 
+logger = logging.getLogger('sanic')
+
 
 class ServiceInfo(object):
 
@@ -56,10 +58,13 @@ async def register_service(self, host=None, port=None):
         check = consul.Check.http(url, '10s')
         await service.register(self.name, service_id=self.service_id,
                                address=address, port=port, check=check)
+        logger.info('register service: name: {}, service_id: {}, address: {}, port:{}'
+            .format(self.name, self.service_id, address, port))
 
     async def deregister(self):
         service = self.consul.agent.service
         await service.deregister(self.service_id)
+        logger.info('deregister service: {}'.format(self.service_id))
 
     async def discovery_service(self, service_name):
         catalog = self.consul.catalog
@@ -94,10 +99,13 @@ async def check_service(self, service_name):
 
 async def service_watcher(app, loop):
     service = ServiceManager(loop=loop, host=app.config['CONSUL_AGENT_HOST'])
+    logger.info('service watcher...')
     app.services = defaultdict(list)
     while True:
         services = await service.discovery_services()
         for name in services[1].keys():
+            if 'consul' == name:
+                continue
             result = await service.discovery_service(name)
             checks = await service.check_service(name)
             for res in result:

sanicms/utils.py

@@ -1,6 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
+import json
 import logging
 import asyncio
 import aiohttp
@@ -36,7 +37,8 @@ def id_to_hex(id):
         return None
     return '{0:x}'.format(id)
 
-async def consume(q, zs):
+async def consume(q, app):
+    zs = app.config['ZIPKIN_SERVER']
     async with aiohttp.ClientSession() as session:
         while True:
             # wait for an item from the producer
@@ -112,7 +114,7 @@ def default(self, request, exception):
             span.set_tag('http.status_code', str(exception.status_code))
             span.set_tag('error.kind', exception.__class__.__name__)
             span.set_tag('error.msg', exception.message)
-            return json(data, status=exception.status_code)
+            return json.dumps(data, status=exception.status_code)
         return super().default(request, exception)
 
 def before_request(request):