chore(logger): add before log report callback

Tencent · Jul 30, 2018 · 89f958e · 89f958e
1 parent ceaa05e
commit 89f958e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 18 deletions.
diff --git a/bin/proxy/websocket.js b/bin/proxy/websocket.js
@@ -34,7 +34,6 @@ function wsFiller(ws, req) {
     ws.logReportTimer = null;
     ws.__tempSend = ws.send;
     ws.reportIndex = 1;
-    ws.messageTriggerCount = 0;
 
     ws.send = function(message) {
         if (ws.readyState == WebSocket.OPEN) {
@@ -52,7 +51,6 @@ function wsFiller(ws, req) {
 
 function emitReportLog(ws, type) {
     ws.upgradeReq.emit(type);
-    ws.messageTriggerCount = 0;
 }
 
 function reportWebSocketLog(ws, isEnd) {
@@ -65,8 +63,6 @@ function reportWebSocketLog(ws, isEnd) {
     } else if (logLength > 30) {
         // 立即上报
         emitReportLog(ws, 'reportLogStream');
-    } else if (ws.messageTriggerCount > 9) {
-        emitReportLog(ws, 'reportLogStream');
     } else {
         ws.logReportTimer = setTimeout(function() {
             emitReportLog(ws, 'reportLogStream');
@@ -90,6 +86,10 @@ function bind_listen(server) {
         d.currentContext.window.websocket = ws;
         d.currentContext.window.response = {};
         d.currentContext.isWebsocket = true;
+        d.currentContext.beforeLogClean = function() {
+            logReport.reportLog();
+            logger.clean();
+        };
 
         if (config.enableWindow) {
             d.currentContext.window.enable();
@@ -194,7 +194,6 @@ function bind_listen(server) {
             };
 
             ws.on('message', function(message) {
-                ws.messageTriggerCount++;
                 logger.debug('server get message : ${message}', {
                     message
                 });
@@ -232,7 +231,6 @@ function bind_listen(server) {
 
                     req.removeAllListeners('fail');
                     req.removeAllListeners('reportLog');
-                    req.removeAllListeners('logFilled');
 
                     if (d.currentContext) {
                         d.currentContext.window.websocket = null;
@@ -265,11 +263,6 @@ function bind_listen(server) {
 
             logReport();
             reportWebSocketLog(ws);
-
-            req.on('logFilled', function() {
-                logReport.reportLog();
-                logger.clean();
-            });
         });
     });
 }

diff --git a/bin/tsw/util/logger/logger.js b/bin/tsw/util/logger/logger.js
@@ -255,14 +255,14 @@ Logger.prototype = {
                 }
             }
 
-            if (log.arr.length > 1000 || (log.json && log.json.ajax && log.json.ajax.length > 30)) {
-                if (!contextMod.currentContext().emitLogFilled) {
-                    contextMod.currentContext().emitLogFilled = true;
-                    window && window.request && window.request.emit('logFilled');
-                    setTimeout(function() {
-                        contextMod.currentContext().emitLogFilled = false;
-                    }, 1000);
+            if (log.arr.length % 512 === 0 || (log.json && log.json.ajax && log.json.ajax.length % 10 === 0)) {
+                const beforeLogClean = contextMod.currentContext().beforeLogClean;
+                if (typeof beforeLogClean === 'function') {
+                    beforeLogClean();
                 }
+            } else if (log.arr.length % 1024 === 0 || (log.json && log.json.ajax && log.json.ajax.length % 20 === 0)) {
+                process.emit('warning', new Error('too many log'));
+                this.clean();
             }
         }
     },