fix(websocket log): clear logJson

Tencent · Jul 18, 2018 · 2f94faa · 2f94faa
1 parent f280461
commit 2f94faa
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/bin/tsw/util/auto-report/logReport.js b/bin/tsw/util/auto-report/logReport.js
@@ -676,7 +676,7 @@ function reportLog() {
                 res._body = Buffer.from(format.formatBuffer(res._body));
             }
 
-            logJson = logJson || logger.getJson() || {};
+            logJson = logJson || logger.getJson(isWebSocket) || {};
             logJson.curr = {
                 protocol: 'HTTP',
                 host: req.headers.host,

diff --git a/bin/tsw/util/logger/logger.js b/bin/tsw/util/logger/logger.js
@@ -80,7 +80,7 @@ Logger.prototype = {
         contextMod.currentContext().log = null;
     },
 
-    getJson: function() {
+    getJson: function(cleared) {
         const log = this.getLog();
         let json = {
             curr: {},
@@ -97,6 +97,10 @@ Logger.prototype = {
             log.json = json;
         }
 
+        if (cleared) {
+            log.json = null;
+        }
+
         return json;
     },