From 221b666262848e3735f07eec0c0514bc99b1ff94 Mon Sep 17 00:00:00 2001
From: Ken Moore <moorekou@gmail.com>
Date: Fri, 1 Apr 2016 15:06:10 -0400
Subject: [PATCH] Turn off some debugging, and switch the pkg database
 connection system over to a clone system so one request cannot interfere with
 another.

---
 src/server/WebSocket.cpp          | 2 +-
 src/server/library/sysadm-pkg.cpp | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/server/WebSocket.cpp b/src/server/WebSocket.cpp
index 7a30989..f42d614 100644
--- a/src/server/WebSocket.cpp
+++ b/src/server/WebSocket.cpp
@@ -439,7 +439,7 @@ void WebSocket::EventUpdate(EventWatcher::EVENT_TYPE evtype, QJsonValue msg){
     out.out_args = msg;
     out.Header << "Content-Type: text/json; charset=utf-8"; //REST header info
     out.in_struct.name = EventWatcher::typeToString(evtype);
-  qDebug() << "Send Event:" << out.assembleMessage();
+  //qDebug() << "Send Event:" << out.assembleMessage();
   //Now send the message back through the socket
   this->emit SendMessage(out.assembleMessage());
 }
diff --git a/src/server/library/sysadm-pkg.cpp b/src/server/library/sysadm-pkg.cpp
index 72067a6..970077c 100644
--- a/src/server/library/sysadm-pkg.cpp
+++ b/src/server/library/sysadm-pkg.cpp
@@ -37,7 +37,7 @@ inline void annotations_from_ids(QStringList var_ids, QStringList val_ids, QJson
     }
   //Now go through and add them to the JsonObject in pairs
   for(int i=0; i<var_ids.length(); i++){
-    qDebug() << "Got Annotation:" << var_ids[i] <<":"<<val_ids[i];
+    //qDebug() << "Got Annotation:" << var_ids[i] <<":"<<val_ids[i];
     out->insert(var_ids[i], val_ids[i]);
   }
 }
@@ -85,7 +85,7 @@ QJsonObject PKG::pkg_info(QStringList origins, QString repo, QString category, b
   if(QSqlDatabase::contains()){
     //database already loaded
     qDebug() << "Existing DB Connection";
-    DB = QSqlDatabase::database();
+    DB = QSqlDatabase::cloneDatabase(QSqlDatabase::database(), QUuid::createUuid().toString());
   }else{
     //new database needs to be loaded
     qDebug() << "New DB Connection";
@@ -95,7 +95,7 @@ QJsonObject PKG::pkg_info(QStringList origins, QString repo, QString category, b
     DB.setDatabaseName(dbname);*/
   }
   if(DB.databaseName()!=dbname){
-    if(DB.isOpen()){ DB.close(); }
+    if(DB.isOpen()){ qDebug() << " - Close DB:" << repo; DB.close(); }
     DB.setConnectOptions("QSQLITE_OPEN_READONLY=1");	  
     DB.setHostName("localhost");
     DB.setDatabaseName(dbname);
@@ -201,6 +201,7 @@ QJsonObject PKG::pkg_info(QStringList origins, QString repo, QString category, b
        //Now insert this information into the main object
        retObj.insert(origin,info);
   } //end loop over pkg matches
+  qDebug() << " - Done with DB:" << repo;
   DB.close();
   return retObj;
 }
@@ -279,7 +280,7 @@ QJsonArray PKG::list_categories(QString repo){
   if(QSqlDatabase::contains()){
     //database already loaded
     qDebug() << "Existing DB Connection";
-    DB = QSqlDatabase::database();
+    DB = QSqlDatabase::cloneDatabase(QSqlDatabase::database(), QUuid::createUuid().toString());
   }else{
     //new database needs to be loaded
     qDebug() << "New DB Connection";