fix: logger notice format not valid

searchfe · Mar 25, 2021 · a864b1e · a864b1e
1 parent c07947e
commit a864b1e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/packages/logger/src/constants.ts b/packages/logger/src/constants.ts
@@ -18,7 +18,7 @@ const normalFormat = ':level: :time [:file::line]'
 const noticeFormat = ':level: :time [:file::line]'
     + ' errno[:errno] status[:status] logId[:logid]'
     + ' uri[:uri] app[:app] product[:product] module[:module]'
-    + ' clientIp[:ip] ua[:ua] refer[:referrer] cookie[:cookie] :notices :performance responseTime[:response-time]';
+    + ' clientIp[:ip] ua[:ua] refer[:referrer] cookie[:cookie] :notices tm[:performance] responseTime[:response-time]';
 
 const errorFormat = ':level: :time [:file::line]'
     + ' errno[:errno] status[:status] logId[:logid]'

diff --git a/packages/logger/src/tokens.ts b/packages/logger/src/tokens.ts
@@ -77,7 +77,7 @@ export default {
     },
     notices(o) {
         if (isEmpty(o.req?.notices)) {
-            return '';
+            return 'request completed';
         }
         return Object.keys(o.req.notices).map(key => {
             const notice = o.req.notices[key];
@@ -92,7 +92,7 @@ export default {
             const pref = o.req.performance[key];
             return `${key}:${pref[0]}:${pref[1].toFixed(1)}`;
         }).join(' ');
-        return `tm[${perfStr}]`;
+        return perfStr;
     },
     req: function (o, field) {
         if (!field) {