@goodware/mysql
Advanced tools
Comparing version 1.0.2 to 1.0.3
20
MySql.js
@@ -59,4 +59,7 @@ /* eslint-disable no-param-reassign */ | ||
usePool: Joi.boolean(), | ||
logger: Joi.object(), | ||
}); | ||
const logTag = 'mysql'; | ||
/** | ||
@@ -235,5 +238,4 @@ * @description Creates mysql2-promise Connection objects, optionally from a | ||
if (this.stopped) throw new Error('Stopped'); | ||
if (!logger) logger = this.logger; | ||
if (logger) logger = logger.logger('MySql'); | ||
// Loop until connectRetryTimeout is reached. Loop at least once. | ||
@@ -289,3 +291,3 @@ const stopTime = Date.now() + this.connectRetryTimeout; | ||
if (logger) { | ||
logger.warn({ | ||
logger.log(['warn', logTag], { | ||
message: `Rollback transaction on '${this.connectOptions.host}'`, | ||
@@ -301,3 +303,3 @@ host: this.connectOptions.host, | ||
if (logger) { | ||
logger.error({ | ||
logger.log(['error', logTag], { | ||
message: `Rollback transaction failed on '${this.connectOptions.host}'`, | ||
@@ -313,3 +315,3 @@ host: this.connectOptions.host, | ||
if (logger) { | ||
logger.error({ | ||
logger.log(['error', logTag], { | ||
message: `Destroying connection failed on '${this.connectOptions.host}'`, | ||
@@ -331,3 +333,3 @@ host: this.connectOptions.host, | ||
if (logger) { | ||
logger.error({ | ||
logger.log(['error', logTag], { | ||
message: `Dead connection detected on '${this.connectOptions.host}'`, | ||
@@ -343,3 +345,3 @@ host: this.connectOptions.host, | ||
if (logger) { | ||
logger.error({ | ||
logger.log(['error', logTag], { | ||
message: `Destroying connection failed on '${this.connectOptions.host}'`, | ||
@@ -382,3 +384,3 @@ host: this.connectOptions.host, | ||
logger.warn({ | ||
logger.log(['warn', logTag], { | ||
message: `Waiting ${humanizeDuration(delayMs)} for '${user}@${host}:${port}/${database}' IAM: ${useIAM}`, | ||
@@ -406,3 +408,3 @@ host, | ||
if (logger) { | ||
logger.error({ | ||
logger.log(['error', logTag], { | ||
message: `Releasing connection failed on '${this.connectOptions.host}'`, | ||
@@ -409,0 +411,0 @@ host: this.connectOptions.host, |
{ | ||
"name": "@goodware/mysql", | ||
"version": "1.0.2", | ||
"version": "1.0.3", | ||
"description": "Database connection and execution utility for the mysql2 npm package", | ||
@@ -5,0 +5,0 @@ "keywords": [ |
17580
445