Fix #2504

server/util-server.js

@@ -248,19 +248,19 @@ exports.dnsResolve = function (hostname, resolverServer, resolverPort, rrtype) {
  * @param {string} query The query to validate the database with
  * @returns {Promise<(string[]|Object[]|Object)>}
  */
-exports.mssqlQuery = function (connectionString, query) {
+exports.mssqlQuery = async function (connectionString, query) {
-    return new Promise((resolve, reject) => {
+    let pool;
-        mssql.connect(connectionString).then(pool => {
+    try {
-            return pool.request()
+        pool = new mssql.ConnectionPool(connectionString);
-                .query(query);
+        await pool.connect();
-        }).then(result => {
+        await pool.request().query(query);
-            resolve(result);
+        pool.close();
-        }).catch(err => {
+    } catch (e) {
-            reject(err);
+        if (pool) {
-        }).finally(() => {
+            pool.close();
-            mssql.close();
+        }
-        });
+        throw e;
-    });
+    }
 };
 
 /**