VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-09-06 07:07:48 -04:00
Code Issues Projects Releases Wiki Activity

Server: web API: implemented /sdrangel/logging PUT

Browse Source
This commit is contained in:
f4exb 2017-12-18 14:50:58 +01:00
parent e428f55c82
commit 4049665774
2 changed files with 81 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
sdrsrv/webapi/webapiadaptersrv.cpp
View File

@ -155,6 +155,43 @@ int WebAPIAdapterSrv::instanceLoggingGet(
return 200; return 200;
} }
int WebAPIAdapterSrv::instanceLoggingPut(
SWGSDRangel::SWGLoggingInfo& response,
SWGSDRangel::SWGErrorResponse& error __attribute__((unused)))
{
// response input is the query actually
bool dumpToFile = (response.getDumpToFile() != 0);
QString* consoleLevel = response.getConsoleLevel();
QString* fileLevel = response.getFileLevel();
QString* fileName = response.getFileName();
// perform actions
if (consoleLevel) {
m_mainCore.m_settings.setConsoleMinLogLevel(getMsgTypeFromString(*consoleLevel));
}
if (fileLevel) {
m_mainCore.m_settings.setFileMinLogLevel(getMsgTypeFromString(*fileLevel));
}
m_mainCore.m_settings.setUseLogFile(dumpToFile);
if (fileName) {
m_mainCore.m_settings.setLogFileName(*fileName);
}
m_mainCore.setLoggingOptions();
// build response
response.init();
getMsgTypeString(m_mainCore.m_settings.getConsoleMinLogLevel(), *response.getConsoleLevel());
response.setDumpToFile(m_mainCore.m_settings.getUseLogFile() ? 1 : 0);
getMsgTypeString(m_mainCore.m_settings.getFileMinLogLevel(), *response.getFileLevel());
*response.getFileName() = m_mainCore.m_settings.getLogFileName();
return 200;
}
void WebAPIAdapterSrv::getDeviceSetList(SWGSDRangel::SWGDeviceSetList* deviceSetList) void WebAPIAdapterSrv::getDeviceSetList(SWGSDRangel::SWGDeviceSetList* deviceSetList)
{ {
deviceSetList->init(); deviceSetList->init();
@ -238,3 +275,41 @@ void WebAPIAdapterSrv::getDeviceSet(SWGSDRangel::SWGDeviceSet *swgDeviceSet, con
} }
} }
} }
QtMsgType WebAPIAdapterSrv::getMsgTypeFromString(const QString& msgTypeString)
{
if (msgTypeString == "debug") {
return QtDebugMsg;
} else if (msgTypeString == "info") {
return QtInfoMsg;
} else if (msgTypeString == "warning") {
return QtWarningMsg;
} else if (msgTypeString == "error") {
return QtCriticalMsg;
} else {
return QtDebugMsg;
}
}
void WebAPIAdapterSrv::getMsgTypeString(const QtMsgType& msgType, QString& levelStr)
{
switch (msgType)
{
case QtDebugMsg:
levelStr = "debug";
break;
case QtInfoMsg:
levelStr = "info";
break;
case QtWarningMsg:
levelStr = "warning";
break;
case QtCriticalMsg:
case QtFatalMsg:
levelStr = "error";
break;
default:
levelStr = "debug";
break;
}
}

6
sdrsrv/webapi/webapiadaptersrv.h
View File

@ -54,11 +54,17 @@ public:
SWGSDRangel::SWGLoggingInfo& response, SWGSDRangel::SWGLoggingInfo& response,
SWGSDRangel::SWGErrorResponse& error); SWGSDRangel::SWGErrorResponse& error);
virtual int instanceLoggingPut(
SWGSDRangel::SWGLoggingInfo& response,
SWGSDRangel::SWGErrorResponse& error);
private: private:
MainCore& m_mainCore; MainCore& m_mainCore;
void getDeviceSetList(SWGSDRangel::SWGDeviceSetList* deviceSetList); void getDeviceSetList(SWGSDRangel::SWGDeviceSetList* deviceSetList);
void getDeviceSet(SWGSDRangel::SWGDeviceSet *swgDeviceSet, const DeviceSet* deviceSet, int deviceUISetIndex); void getDeviceSet(SWGSDRangel::SWGDeviceSet *swgDeviceSet, const DeviceSet* deviceSet, int deviceUISetIndex);
static QtMsgType getMsgTypeFromString(const QString& msgTypeString);
static void getMsgTypeString(const QtMsgType& msgType, QString& level);
}; };
#endif /* SDRSRV_WEBAPI_WEBAPIADAPTERSRV_H_ */ #endif /* SDRSRV_WEBAPI_WEBAPIADAPTERSRV_H_ */