merged

server/model/monitor.js

@@ -89,7 +89,7 @@ class Monitor extends BeanModel {
             mqttTopic: this.mqttTopic,
             mqttSuccessMessage: this.mqttSuccessMessage,
             databaseConnectionString: this.databaseConnectionString,
-            databaseQuery: this.databaseQuery
+            databaseQuery: this.databaseQuery,
         };
 
         if (includeSensitiveData) {

server/util-server.js

@@ -217,7 +217,6 @@ exports.sqlserver = function (connectionString, query) {
         });
 
         mssql.connect(connectionString).then(pool => {
-
             return pool.request()
                 .query(query);
         }).then(result => {