More fixes to the closing of virtuoso connections.

feup-infolab · Apr 6, 2018 · 6e8c57c · 6e8c57c
1 parent f80f814
commit 6e8c57c
Show file tree

Hide file tree

Showing 5 changed files with 187 additions and 191 deletions.
diff --git a/conf/deployment_configs.json b/conf/deployment_configs.json
@@ -1311,7 +1311,7 @@
         "mySQLDBName": "TRAVISTESTSdendroVagrantDemo",
         "maxUploadSize": 2147483648,
         "maxProjectSize": 5368709120,
-        "maxSimultaneousConnectionsToDb": 10,
+        "maxSimultaneousConnectionsToDb": 2,
         "dbOperationTimeout": 16000,
         "tempFilesDir": "temp",
         "tempUploadsDir": "temp_uploads",

diff --git a/src/bootup/init/init_mysql.js b/src/bootup/init/init_mysql.js
@@ -28,9 +28,10 @@ const initMySQL = function (app, callback)
                 }
                 else
                 {
-                    if(Config.getMySQLByID().connection)
+                    if (Config.getMySQLByID().connection)
                     {
-                        Config.getMySQLByID().connection.releaseAllConnections(function(){
+                        Config.getMySQLByID().connection.releaseAllConnections(function ()
+                        {
                             Config.getMySQLByID().connection = client;
                             Logger.log("ReConnected to MySQL Database server running on " + Config.mySQLHost + ":" + Config.mySQLPort);
                             return callback(null);

diff --git a/src/kb/cache/caches/mongodb.js b/src/kb/cache/caches/mongodb.js
@@ -204,9 +204,8 @@ MongoDBCache.prototype.getByQuery = function (query, callback)
                     }
                     Logger.log("error", "Error running query: " + JSON.stringify(query, null, 4));
                     Logger.log("error", err.stack);
-                    return callback(err, "Unable to execute query " + JSON.stringify(query) + " from mongodb cache.");
-
                     cursor.close();
+                    return callback(err, "Unable to execute query " + JSON.stringify(query) + " from mongodb cache.");
                 });
             }
             else