fix logging

edkfjc43782 · Oct 30, 2018 · a3d624a · a3d624a
1 parent 3a96c22
commit a3d624a
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 13 deletions.
diff --git a/examples/develop/cluster.sh b/examples/develop/cluster.sh
@@ -4,6 +4,7 @@ log() {
 
 SWARM_MASTER=ms-master
 NETWORK_NAME=ms_sanic-network
+docker-machine rm -f $SWARM_MASTER
 docker-machine create $SWARM_MASTER -d virtualbox
 
 eval $(docker-machine env $SWARM_MASTER)
@@ -35,6 +36,7 @@ docker run -d --name $SWARM_MASTER --hostname $SWARM_MASTER \
 
 SWARM_NODES=("ms-node1" "ms-node2")
 for node in "${SWARM_NODES[@]}"; do
+    docker-machine rm -f $node
     docker-machine create $node -d virtualbox
     eval $(docker-machine env $node)
     docker swarm join --token $SWARM_MASTER_TOKEN $SWARM_MASTER_IP:2377

diff --git a/sanicms/loggers.py b/sanicms/loggers.py
@@ -116,14 +116,14 @@ async def _decorator(*args, **kwargs):
             }
             span = None
             if request and tracing:
-                #oldspan = request['span']
+                # oldspan = request['span']
                 span = gen_span(request, fn.__name__)
-                span.tags.update(log)
-                #request['span'] = span
-                log.update({
-                    'start_time': span.start_time,
-                    'trace_id': span.context.trace_id
-                })
+                # span.tags.update(log)
+                # request['span'] = span
+                # log.update({
+                #     'start_time': span.start_time,
+                #     'trace_id': span.context.trace_id
+                # })
             else:
                 start_time = time.time()
                 log.update({
@@ -136,7 +136,7 @@ async def _decorator(*args, **kwargs):
             try:
                 exce = False
                 res = await fn(*args, **kwargs)
-                #request['span'] = oldspan
+                # request['span'] = oldspan
                 return res
             except Exception as e:
                 exce = True
@@ -147,10 +147,10 @@ async def _decorator(*args, **kwargs):
                         span.set_tag(
                             'component', '{}-{}'.format(request.app.name, log['log_type']))
                         span.finish()
-                        log.update({
-                            'duration': span.duration,
-                            'end_time': span.start_time + span.duration
-                        })
+                        # log.update({
+                        #     'duration': span.duration,
+                        #     'end_time': span.start_time + span.duration
+                        # })
                     else:
                         end_time = time.time()
                         log.update({

diff --git a/sanicms/service.py b/sanicms/service.py
@@ -47,11 +47,11 @@ def get_host_ip(self):
         return ip
 
     async def register_service(self, host=None, port=None):
-        logger.info('register service...')
         if not port:
             return
         m = hashlib.md5()
         address = host or self.get_host_ip()
+        logger.info('register service ==> host:{}, port{}'.format(address, port))
         url = 'http://{}:{}/'.format(address, port)
         m.update(url.encode('utf-8'))
         self.service_id = m.hexdigest()