Merge pull request 'refs #7584 workerTimeControl' (#6) from 7584-workerTimeControl into master

Reviewed-on: #6
Reviewed-by: Juan Ferrer <juan@verdnatura.es>

config/logs.yml

@@ -4,6 +4,7 @@ logMainShowField: false
 upperCaseTable: true
 userField: editorFk
 rowExcludeField: logExclude
+ignoreSystem: false
 excludeRegex: '__$'
 showFields:
   - name

lib/model-loader.js

@@ -94,7 +94,8 @@ module.exports = class ModelLoader {
     ];
     const globalProps = [
       'userField',
-      'rowExcludeField'
+      'rowExcludeField',
+      'ignoreSystem'
     ];
   
     for (const [schema, table, tableInfo] of schemaMap) {

mylogger.js

@@ -57,12 +57,9 @@ module.exports = class MyLogger {
   async init() {
     const {conf} = this;
     this.debug('MyLogger', 'Initializing.');
-    this.onErrorListener = err => this.onError(err);
 
     // DB connection
-
     const db = this.db = await mysql.createConnection(conf.dstDb);
-    db.on('error', this.onErrorListener);
 
     await this.modelLoader.loadSchema();
     await this.showDb.loadSchema();
@@ -135,8 +132,6 @@ module.exports = class MyLogger {
     this.running = false;
     this.debug('MyLogger', 'Ending.');
 
-    this.db.off('error', this.onErrorListener);
-
     clearInterval(this.flushInterval);
     clearInterval(this.pingInterval);
     clearInterval(this.flushTimeout);
@@ -206,7 +201,6 @@ module.exports = class MyLogger {
       zongji.once('error',  onError);
       zongji.start(zongjiOpts);
     });
-    zongji.on('error', this.onErrorListener);
     this.zongji = zongji;
     this.debug('Zongji', 'Started.');
   }
@@ -220,7 +214,6 @@ module.exports = class MyLogger {
     this.zongji = null;
 
     zongji.off('binlog', this.onBinlogListener);
-    zongji.off('error', this.onErrorListener);
 
     // FIXME: Cannot call Zongji.stop(), it doesn't wait to end connection
     zongji.connection.destroy(() => {
@@ -250,7 +243,7 @@ module.exports = class MyLogger {
     }
   }
 
-  async onError(err) {
+  async handleError(err) {
     if (!this.isOk) return;
     this.isOk = false;
     console.log(`Error: ${err.code}: ${err.message}`);
@@ -259,19 +252,19 @@ module.exports = class MyLogger {
       await this.end(true);
     } catch(e) {}
 
-    switch (err.code) {
-      case 'PROTOCOL_CONNECTION_LOST':
-      case 'ECONNRESET':
-      console.log('Trying to restart process.');
+    // FIXME: Error of mysql2/promise
+    if (err.message === `Can't add new command when connection is in closed state`)
       await this.tryRestart();
-      break;
-    default:
-      process.exit();
-    }
-  }
-
-  handleError(err) {
-    console.error(err);
+    else
+      switch (err.code) {
+        case 'PROTOCOL_CONNECTION_LOST':
+        case 'ECONNRESET':
+        console.log('Trying to restart process.');
+        await this.tryRestart();
+        break;
+      default:
+        process.exit();
+      }
   }
 
   async onBinlog(evt) {
@@ -312,14 +305,16 @@ module.exports = class MyLogger {
     const table = evt.tableMap[evt.tableId];
     const tableName = table.tableName;
     const tableInfo = this.schemaMap.get(table.parentSchema, tableName);
+    
     if (!tableInfo) return;
     
     const action = actions[eventName];
-    const {rowExcludeField} = tableInfo;
+    const {rowExcludeField, ignoreSystem} = tableInfo;
     const changes = [];
 
     function isExcluded(row) {
-      return rowExcludeField && row[rowExcludeField];
+      return (rowExcludeField && row[rowExcludeField])
+        || (ignoreSystem && row.editorFk == null);
     }
 
     function cast(value, type) {
@@ -492,6 +487,7 @@ module.exports = class MyLogger {
     const isDelete = action == 'delete';
     const isUpdate = action == 'update';
     const created = new Date(evt.timestamp);
+    const showId = tableInfo.conf.showId;
 
     for (const change of changes) {
       let newI, oldI;
@@ -514,7 +510,7 @@ module.exports = class MyLogger {
           oldI = change.instance;
           break;
       }
-      const summaryId = row[tableInfo.conf.showId];
+      const summaryId = showId ? row[showId] : null;
       const modelId = row[tableInfo.idName];
       const modelValue = change.modelValue ?? null;
       const oldInstance = oldI ? JSON.stringify(oldI) : null;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "mylogger",
-  "version": "1.1.4",
+  "version": "1.1.5",
   "author": "Verdnatura Levante SL",
   "description": "MySQL and MariaDB logger using binary log",
   "license": "GPL-3.0",