github-personal/sysadm
1
0
Fork 0
mirror of https://github.com/outbackdingo/sysadm.git synced 2026-01-27 10:20:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Turn off some debugging, and switch the pkg database connection system over to a clone system so one request cannot interfere with another.

Browse Source
This commit is contained in:
Ken Moore
2016-04-01 15:06:10 -04:00
parent e5d8c33b81
commit 221b666262
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/server/WebSocket.cpp
View File

@@ -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());
}

9
src/server/library/sysadm-pkg.cpp
View File

@@ -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";