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

Make sure the port numbers get changed a bit, and fix some complication issues in the new backend.

Browse Source
This commit is contained in:
Ken Moore
2015-12-29 12:54:01 -05:00
parent 90e23c882e
commit 508e025cea
3 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/server/WebBackend.cpp
View File

@@ -15,7 +15,7 @@
#define DEBUG 0
#define SCLISTDELIM QString("::::") //SysCache List Delimiter
void WebSocket::EvaluateBackendRequest(QString name, const QJsonValue args, QJsonObject *out){
RestOutputStruct::ExitCode WebSocket::EvaluateBackendRequest(QString name, const QJsonValue args, QJsonObject *out){
//Go through and forward this request to the appropriate sub-system
if(name.toLower()=="syscache"){
return EvaluateSyscacheRequest(args, out);
@@ -27,16 +27,15 @@ void WebSocket::EvaluateBackendRequest(QString name, const QJsonValue args, QJso
}
RestOutputStruct::ExitCode WebSocket::EvaluateSyscacheRequest(const QJsonValue in_args, QJSonObject *out){
RestOutputStruct::ExitCode WebSocket::EvaluateSyscacheRequest(const QJsonValue in_args, QJsonObject *out){
//syscache only needs a list of sub-commands at the moment (might change later)
QStringList in_req;
//Parse the input arguments structure
if(args.isArray()){ in_req = JsonArrayToStringList(args.toArray()); }
else if(args.isObject()){
QStringList keys = arg.toObject().keys();
for(int i=0; i<keys.length(); i++){ in_req << JsonValueToString(args.toObject().value(keys[i])); }
}else if(args.isValue()){ in_req << JsonValueToString(args.toValue()); }
if(in_args.isArray()){ in_req = JsonArrayToStringList(in_args.toArray()); }
else if(in_args.isObject()){
QStringList keys = in_args.toObject().keys();
for(int i=0; i<keys.length(); i++){ in_req << JsonValueToString(in_args.toObject().value(keys[i])); }
}else{ return RestOutputStruct::BADREQUEST; }
//Run the Request (should be one value for each in_req)
@@ -60,16 +59,15 @@ RestOutputStruct::ExitCode WebSocket::EvaluateSyscacheRequest(const QJsonValue i
return RestOutputStruct::OK;
}
RestOutputStruct::ExitCode WebSocket::EvaluateDispatcherRequest(const QJsonValue in_args, QJSonObject *out){
RestOutputStruct::ExitCode WebSocket::EvaluateDispatcherRequest(const QJsonValue in_args, QJsonObject *out){
//dispatcher only needs a list of sub-commands at the moment (might change later)
QStringList in_req;
//Parse the input arguments structure
if(args.isArray()){ in_req = JsonArrayToStringList(args.toArray()); }
else if(args.isObject()){
QStringList keys = arg.toObject().keys();
for(int i=0; i<keys.length(); i++){ in_req << JsonValueToString(args.toObject().value(keys[i])); }
}else if(args.isValue()){ in_req << JsonValueToString(args.toValue()); }
if(in_args.isArray()){ in_req = JsonArrayToStringList(in_args.toArray()); }
else if(in_args.isObject()){
QStringList keys = in_args.toObject().keys();
for(int i=0; i<keys.length(); i++){ in_req << JsonValueToString(in_args.toObject().value(keys[i])); }
}else{ return RestOutputStruct::BADREQUEST; }
//Run the Request (should be one value for each in_req)

2
src/server/WebSocket.h
View File

@@ -48,7 +48,9 @@ private:
void SetOutputError(QJsonObject *ret, QString id, int err, QString msg);
//Backend request/reply functions (contained in WebBackend.cpp)
// -- Main subsystem parser
RestOutputStruct::ExitCode EvaluateBackendRequest(QString name, const QJsonValue in_args, QJsonObject *out);
// -- Individual subsystems
RestOutputStruct::ExitCode EvaluateSyscacheRequest(const QJsonValue in_args, QJsonObject *out);
RestOutputStruct::ExitCode EvaluateDispatcherRequest(const QJsonValue in_args, QJsonObject *out);

4
src/server/main.cpp
View File

@@ -18,8 +18,8 @@
#endif
#define DEBUG 1
#define WSPORTNUMBER 12142 // WebSocket server default port
#define PORTNUMBER 12142 // TCP server default port
#define WSPORTNUMBER 12150 // WebSocket server default port
#define PORTNUMBER 12151 // TCP server default port
QFile logfile;
void MessageOutput(QtMsgType type, const QMessageLogContext &context, const QString &msg){