VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-08-03 14:32:25 -04:00
Code Issues Projects Releases Wiki Activity

SDRdaemon: Web API: implemented logging methods

Browse Source
This commit is contained in:
f4exb 2018-08-19 01:28:29 +02:00
parent d7c7eb9f43
commit e3a094c9a1
3 changed files with 53 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sdrdaemon/sdrdaemonmain.h
View File

@ -51,6 +51,8 @@ public:
~SDRDaemonMain(); ~SDRDaemonMain();
static SDRDaemonMain *getInstance() { return m_instance; } // Main Core is de facto a singleton so this just returns its reference static SDRDaemonMain *getInstance() { return m_instance; } // Main Core is de facto a singleton so this just returns its reference
friend class WebAPIAdapterDaemon;
signals: signals:
void finished(); void finished();

2
sdrdaemon/sdrdaemonparser.cpp
View File

@ -129,7 +129,7 @@ void SDRDaemonParser::parse(const QCoreApplication& app)
qWarning() << "SDRDaemonParser::parse: data address invalid. Defaulting to " << m_dataAddress; qWarning() << "SDRDaemonParser::parse: data address invalid. Defaulting to " << m_dataAddress;
} }
// server port // data port
QString dataPortStr = m_parser.value(m_dataPortOption); QString dataPortStr = m_parser.value(m_dataPortOption);
serverPort = serverPortStr.toInt(&ok); serverPort = serverPortStr.toInt(&ok);

61
sdrdaemon/webapi/webapiadapterdaemon.cpp
View File

@ -17,12 +17,15 @@
/////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////
#include "SWGDaemonSummaryResponse.h" #include "SWGDaemonSummaryResponse.h"
#include "SWGLoggingInfo.h"
#include "SWGDeviceSettings.h" #include "SWGDeviceSettings.h"
#include "SWGDeviceState.h" #include "SWGDeviceState.h"
#include "SWGDeviceReport.h" #include "SWGDeviceReport.h"
#include "SWGErrorResponse.h" #include "SWGErrorResponse.h"
#include "webapiadapterdaemon.h" #include "webapiadapterdaemon.h"
#include "sdrdaemonmain.h"
#include "loggerwithfile.h"
QString WebAPIAdapterDaemon::daemonInstanceSummaryURL = "/sdrdaemon"; QString WebAPIAdapterDaemon::daemonInstanceSummaryURL = "/sdrdaemon";
QString WebAPIAdapterDaemon::daemonInstanceLoggingURL = "/sdrdaemon/logging"; QString WebAPIAdapterDaemon::daemonInstanceLoggingURL = "/sdrdaemon/logging";
@ -49,22 +52,58 @@ int WebAPIAdapterDaemon::daemonInstanceSummary(
} }
int WebAPIAdapterDaemon::daemonInstanceLoggingGet( int WebAPIAdapterDaemon::daemonInstanceLoggingGet(
SWGSDRangel::SWGLoggingInfo& response __attribute__((unused)), SWGSDRangel::SWGLoggingInfo& response,
SWGSDRangel::SWGErrorResponse& error) SWGSDRangel::SWGErrorResponse& error __attribute__((unused)))
{ {
error.init(); response.init();
*error.getMessage() = "Not implemented"; response.setDumpToFile(m_sdrDaemonMain.m_logger->getUseFileLogger() ? 1 : 0);
return 501;
if (response.getDumpToFile()) {
m_sdrDaemonMain.m_logger->getLogFileName(*response.getFileName());
m_sdrDaemonMain.m_logger->getFileMinMessageLevelStr(*response.getFileLevel());
}
m_sdrDaemonMain.m_logger->getConsoleMinMessageLevelStr(*response.getConsoleLevel());
return 200;
} }
int WebAPIAdapterDaemon::daemonInstanceLoggingPut( int WebAPIAdapterDaemon::daemonInstanceLoggingPut(
SWGSDRangel::SWGLoggingInfo& query __attribute__((unused)), SWGSDRangel::SWGLoggingInfo& query,
SWGSDRangel::SWGLoggingInfo& response __attribute__((unused)), SWGSDRangel::SWGLoggingInfo& response,
SWGSDRangel::SWGErrorResponse& error) SWGSDRangel::SWGErrorResponse& error __attribute__((unused)))
{ {
error.init(); // response input is the query actually
*error.getMessage() = "Not implemented"; bool dumpToFile = (query.getDumpToFile() != 0);
return 501; QString* consoleLevel = query.getConsoleLevel();
QString* fileLevel = query.getFileLevel();
QString* fileName = query.getFileName();
// perform actions
if (consoleLevel) {
m_sdrDaemonMain.m_settings.setConsoleMinLogLevel(getMsgTypeFromString(*consoleLevel));
}
if (fileLevel) {
m_sdrDaemonMain.m_settings.setFileMinLogLevel(getMsgTypeFromString(*fileLevel));
}
m_sdrDaemonMain.m_settings.setUseLogFile(dumpToFile);
if (fileName) {
m_sdrDaemonMain.m_settings.setLogFileName(*fileName);
}
m_sdrDaemonMain.setLoggingOptions();
// build response
response.init();
getMsgTypeString(m_sdrDaemonMain.m_settings.getConsoleMinLogLevel(), *response.getConsoleLevel());
response.setDumpToFile(m_sdrDaemonMain.m_settings.getUseLogFile() ? 1 : 0);
getMsgTypeString(m_sdrDaemonMain.m_settings.getFileMinLogLevel(), *response.getFileLevel());
*response.getFileName() = m_sdrDaemonMain.m_settings.getLogFileName();
return 200;
} }
int WebAPIAdapterDaemon::daemonSettingsGet( int WebAPIAdapterDaemon::daemonSettingsGet(