Compare commits
3 Commits
6449-summa
...
master
Author | SHA1 | Date |
---|---|---|
Guillermo Bonet | 5857c2294e | |
Guillermo Bonet | 4e709c2091 | |
Guillermo Bonet | 19bcd267c0 |
20
mylogger.js
20
mylogger.js
|
@ -57,12 +57,9 @@ module.exports = class MyLogger {
|
||||||
async init() {
|
async init() {
|
||||||
const {conf} = this;
|
const {conf} = this;
|
||||||
this.debug('MyLogger', 'Initializing.');
|
this.debug('MyLogger', 'Initializing.');
|
||||||
this.onErrorListener = err => this.onError(err);
|
|
||||||
|
|
||||||
// DB connection
|
// DB connection
|
||||||
|
|
||||||
const db = this.db = await mysql.createConnection(conf.dstDb);
|
const db = this.db = await mysql.createConnection(conf.dstDb);
|
||||||
db.on('error', this.onErrorListener);
|
|
||||||
|
|
||||||
await this.modelLoader.loadSchema();
|
await this.modelLoader.loadSchema();
|
||||||
await this.showDb.loadSchema();
|
await this.showDb.loadSchema();
|
||||||
|
@ -135,8 +132,6 @@ module.exports = class MyLogger {
|
||||||
this.running = false;
|
this.running = false;
|
||||||
this.debug('MyLogger', 'Ending.');
|
this.debug('MyLogger', 'Ending.');
|
||||||
|
|
||||||
this.db.off('error', this.onErrorListener);
|
|
||||||
|
|
||||||
clearInterval(this.flushInterval);
|
clearInterval(this.flushInterval);
|
||||||
clearInterval(this.pingInterval);
|
clearInterval(this.pingInterval);
|
||||||
clearInterval(this.flushTimeout);
|
clearInterval(this.flushTimeout);
|
||||||
|
@ -206,7 +201,6 @@ module.exports = class MyLogger {
|
||||||
zongji.once('error', onError);
|
zongji.once('error', onError);
|
||||||
zongji.start(zongjiOpts);
|
zongji.start(zongjiOpts);
|
||||||
});
|
});
|
||||||
zongji.on('error', this.onErrorListener);
|
|
||||||
this.zongji = zongji;
|
this.zongji = zongji;
|
||||||
this.debug('Zongji', 'Started.');
|
this.debug('Zongji', 'Started.');
|
||||||
}
|
}
|
||||||
|
@ -220,7 +214,6 @@ module.exports = class MyLogger {
|
||||||
this.zongji = null;
|
this.zongji = null;
|
||||||
|
|
||||||
zongji.off('binlog', this.onBinlogListener);
|
zongji.off('binlog', this.onBinlogListener);
|
||||||
zongji.off('error', this.onErrorListener);
|
|
||||||
|
|
||||||
// FIXME: Cannot call Zongji.stop(), it doesn't wait to end connection
|
// FIXME: Cannot call Zongji.stop(), it doesn't wait to end connection
|
||||||
zongji.connection.destroy(() => {
|
zongji.connection.destroy(() => {
|
||||||
|
@ -250,7 +243,7 @@ module.exports = class MyLogger {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
async onError(err) {
|
async handleError(err) {
|
||||||
if (!this.isOk) return;
|
if (!this.isOk) return;
|
||||||
this.isOk = false;
|
this.isOk = false;
|
||||||
console.log(`Error: ${err.code}: ${err.message}`);
|
console.log(`Error: ${err.code}: ${err.message}`);
|
||||||
|
@ -259,6 +252,10 @@ module.exports = class MyLogger {
|
||||||
await this.end(true);
|
await this.end(true);
|
||||||
} catch(e) {}
|
} catch(e) {}
|
||||||
|
|
||||||
|
// FIXME: Error of mysql2/promise
|
||||||
|
if (err.message === `Can't add new command when connection is in closed state`)
|
||||||
|
await this.tryRestart();
|
||||||
|
else
|
||||||
switch (err.code) {
|
switch (err.code) {
|
||||||
case 'PROTOCOL_CONNECTION_LOST':
|
case 'PROTOCOL_CONNECTION_LOST':
|
||||||
case 'ECONNRESET':
|
case 'ECONNRESET':
|
||||||
|
@ -270,10 +267,6 @@ module.exports = class MyLogger {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
handleError(err) {
|
|
||||||
console.error(err);
|
|
||||||
}
|
|
||||||
|
|
||||||
async onBinlog(evt) {
|
async onBinlog(evt) {
|
||||||
//evt.dump();
|
//evt.dump();
|
||||||
try {
|
try {
|
||||||
|
@ -492,6 +485,7 @@ module.exports = class MyLogger {
|
||||||
const isDelete = action == 'delete';
|
const isDelete = action == 'delete';
|
||||||
const isUpdate = action == 'update';
|
const isUpdate = action == 'update';
|
||||||
const created = new Date(evt.timestamp);
|
const created = new Date(evt.timestamp);
|
||||||
|
const showId = tableInfo.conf.showId;
|
||||||
|
|
||||||
for (const change of changes) {
|
for (const change of changes) {
|
||||||
let newI, oldI;
|
let newI, oldI;
|
||||||
|
@ -514,7 +508,7 @@ module.exports = class MyLogger {
|
||||||
oldI = change.instance;
|
oldI = change.instance;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
const summaryId = row[tableInfo.conf.showId];
|
const summaryId = showId ? row[showId] : null;
|
||||||
const modelId = row[tableInfo.idName];
|
const modelId = row[tableInfo.idName];
|
||||||
const modelValue = change.modelValue ?? null;
|
const modelValue = change.modelValue ?? null;
|
||||||
const oldInstance = oldI ? JSON.stringify(oldI) : null;
|
const oldInstance = oldI ? JSON.stringify(oldI) : null;
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "mylogger",
|
"name": "mylogger",
|
||||||
"version": "1.1.4",
|
"version": "1.1.5",
|
||||||
"author": "Verdnatura Levante SL",
|
"author": "Verdnatura Levante SL",
|
||||||
"description": "MySQL and MariaDB logger using binary log",
|
"description": "MySQL and MariaDB logger using binary log",
|
||||||
"license": "GPL-3.0",
|
"license": "GPL-3.0",
|
||||||
|
|
Loading…
Reference in New Issue