Added versioning to profiling debug messages

Author: GHMatti

mysql-async.js

@@ -5179,6 +5179,20 @@ class MySQL {
     } else {
       this.logger.error(`[ERROR] [MySQL] Unexpected configuration of type ${typeof mysqlconfig} received.`);
     }
+
+    this.pool.query('SELECT VERSION()', (error, result) => {
+      let versionPrefix = 'MariaDB';
+      if (!error) {
+        const version = result[0]['VERSION()'];
+        if (version[0] === '5' || version[0] === '8') {
+          versionPrefix = 'MySQL';
+        }
+        profiler.setVersion(`${versionPrefix}-${version}`);
+        logger.log('\x1b[32m[mysql-async]\x1b[0m Database server connection established.');
+      } else {
+        logger.error(`[ERROR] ${error.message}`);
+      }
+    });
   }
 
   execute(sql, invokingResource, connection) {
@@ -14750,6 +14764,7 @@ function updateExecutionTimes(object, queryTime) {
 
 class Profiler {
   constructor(logger, config) {
+    this.version = 'MySQL';
     this.startTime = Date.now();
     this.logger = logger;
     this.config = Object.assign({}, profilerDefaultConfig, config);
@@ -14774,6 +14789,10 @@ class Profiler {
     }
   }
 
+  setVersion(version) {
+    this.version = version;
+  }
+
   profile(time, sql, resource) {
     const interval = Math.floor((Date.now() - this.startTime) / this.config.timeInterval);
     const queryTime = time[0] * 1e3 + time[1] * 1e-6;
@@ -14799,11 +14818,11 @@ class Profiler {
     }
 
     if (this.slowQueryWarningTime < queryTime) {
-      this.logger.error(`[MySQL] [Slow Query Warning] [${resource}] [${queryTime.toFixed()}ms] ${sql}`);
+      this.logger.error(`[${this.version}] [Slow Query Warning] [${resource}] [${queryTime.toFixed()}ms] ${sql}`);
     }
 
     if (this.config.trace) {
-      this.logger.log(`[MySQL] [${resource}] [${queryTime.toFixed()}ms] ${sql}`);
+      this.logger.log(`[${this.version}] [${resource}] [${queryTime.toFixed()}ms] ${sql}`);
     }
   }
 }

src/server/mysql.js

@@ -10,6 +10,20 @@ class MySQL {
     } else {
       this.logger.error(`[ERROR] [MySQL] Unexpected configuration of type ${typeof mysqlconfig} received.`);
     }
+
+    this.pool.query('SELECT VERSION()', (error, result) => {
+      let versionPrefix = 'MariaDB';
+      if (!error) {
+        const version = result[0]['VERSION()'];
+        if (version[0] === '5' || version[0] === '8') {
+          versionPrefix = 'MySQL';
+        }
+        profiler.setVersion(`${versionPrefix}-${version}`);
+        logger.log('\x1b[32m[mysql-async]\x1b[0m Database server connection established.');
+      } else {
+        logger.error(`[ERROR] ${error.message}`);
+      }
+    });
   }
 
   execute(sql, invokingResource, connection) {

src/server/profiler.js

@@ -27,6 +27,7 @@ function updateExecutionTimes(object, queryTime) {
 
 class Profiler {
   constructor(logger, config) {
+    this.version = 'MySQL';
     this.startTime = Date.now();
     this.logger = logger;
     this.config = Object.assign({}, profilerDefaultConfig, config);
@@ -51,6 +52,10 @@ class Profiler {
     }
   }
 
+  setVersion(version) {
+    this.version = version;
+  }
+
   profile(time, sql, resource) {
     const interval = Math.floor((Date.now() - this.startTime) / this.config.timeInterval);
     const queryTime = time[0] * 1e3 + time[1] * 1e-6;
@@ -76,11 +81,11 @@ class Profiler {
     }
 
     if (this.slowQueryWarningTime < queryTime) {
-      this.logger.error(`[MySQL] [Slow Query Warning] [${resource}] [${queryTime.toFixed()}ms] ${sql}`);
+      this.logger.error(`[${this.version}] [Slow Query Warning] [${resource}] [${queryTime.toFixed()}ms] ${sql}`);
     }
 
     if (this.config.trace) {
-      this.logger.log(`[MySQL] [${resource}] [${queryTime.toFixed()}ms] ${sql}`);
+      this.logger.log(`[${this.version}] [${resource}] [${queryTime.toFixed()}ms] ${sql}`);
     }
   }
 }