merged

2 years ago · f0ad32a252
parent 5720017fb4 5bba19f866
commit f0ad32a252
2 changed files with 1 additions and 2 deletions
--- a/server/model/monitor.js
+++ b/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) {
--- a/server/util-server.js
+++ b/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 => {