fixed virtuoso port

feup-infolab · Jul 24, 2018 · e7c172a · e7c172a
1 parent 82ea481
commit e7c172a
Show file tree

Hide file tree

Showing 5 changed files with 182 additions and 39 deletions.
diff --git a/conf/deployment_configs.json b/conf/deployment_configs.json
@@ -101,7 +101,7 @@
     },
     "virtuosoHost": "192.168.56.249",
     "virtuosoPort": "8890",
-    "virtuosoISQLPort": "1112",
+    "virtuosoISQLPort": "1111",
     "virtuosoConnector": "jdbc",
     "virtuosoAuth": {
       "user": "dba",
@@ -1111,7 +1111,8 @@
       "destroy_all_graphs": true,
       "destroy_all_indexes": true,
       "destroy_datastore": true,
-      "destroy_files_store": true
+      "destroy_files_store": true,
+      "destroy_mysql_database": true
     },
     "baselines": {},
     "logging": {
@@ -1236,7 +1237,7 @@
       "cooldown_secs": 20
     },
     "docker": {
-      "active": true,
+      "active": false,
       "reuse_checkpoints": true,
       "create_checkpoints": true,
       "destroy_existing_images_at_start": false,

diff --git a/package-lock.json b/package-lock.json
diff --git a/public/app/views/social/showPost.html b/public/app/views/social/showPost.html
@@ -1,9 +1,9 @@
 <!--<div class="panel panel-default" style="margin-left: 20%; margin-right: 20%">-->
 
-<div class="position-arrows">
+<!--<div class="position-arrows">
     <i class="fa fa-arrow-up" ng-click="movePost(postsContents[postUri].uri, 1, postsContents[postUri].fixedPosition)"></i>
     <i class="fa fa-arrow-down click-down" ng-click="movePost(postsContents[postUri].uri, -1, postsContents[postUri].fixedPosition)"></i>
-</div>
+</div>-->
 <div class="centered-spinner">
         <span spinner-key="social-dendro-spinner" us-spinner="{radius:30, width:8, length: 16}"
               spinner-start-active="true"></span>

diff --git a/src/bootup/init/init_mysql.js b/src/bootup/init/init_mysql.js
@@ -20,12 +20,17 @@ const initMySQL = function (app, callback)
             logging: false,
             operatorsAliases: false
         });
+        let query = "CREATE DATABASE IF NOT EXISTS " + Config.mySQLDBName + ";";
+        if (Config.startup.load_databases && Config.startup.destroy_mysql_database)
+        {
+            query = "DROP DATABASE IF EXISTS " + Config.mySQLDBName + ";" + query;
+        }
         sequelize
             .authenticate()
             .then(() =>
             {
                 Logger.log_boot_message("Connected to MySQL!");
-                return sequelize.query("CREATE DATABASE IF NOT EXISTS " + Config.mySQLDBName + ";").then(data =>
+                return sequelize.query(query).then(data =>
                     callback(null, data))
                     .catch(err =>
                     {

diff --git a/src/kb/db.js b/src/kb/db.js
@@ -774,7 +774,8 @@ DbConnection.prototype.create = function (callback)
         {
             if (err)
             {
-                Logger.log("error", "Error initializing Virtuoso connection pool: " + JSON.stringify(err));
+                // Logger.log("error", "Error initializing Virtuoso connection pool: " + JSON.stringify(err));
+                Logger.log("error", "Error initializing Virtuoso connection pool: " + JSON.stringify(err) + " RESULT: " + JSON.stringify(result));
                 callback(err, result);
             }
             else