From debdae9529eea972e53b3cc91d0bf210f9f6ff59 Mon Sep 17 00:00:00 2001 From: f4exb Date: Mon, 18 Dec 2017 13:39:31 +0100 Subject: [PATCH] Server: web API: implemented /sdrangel/logging GET --- sdrsrv/webapi/webapiadaptersrv.cpp | 17 +++++++++++++++++ sdrsrv/webapi/webapiadaptersrv.h | 4 ++++ 2 files changed, 21 insertions(+) diff --git a/sdrsrv/webapi/webapiadaptersrv.cpp b/sdrsrv/webapi/webapiadaptersrv.cpp index b4d068264..38e1cc6a7 100644 --- a/sdrsrv/webapi/webapiadaptersrv.cpp +++ b/sdrsrv/webapi/webapiadaptersrv.cpp @@ -24,6 +24,7 @@ #include "SWGInstanceSummaryResponse.h" #include "SWGInstanceDevicesResponse.h" #include "SWGInstanceChannelsResponse.h" +#include "SWGLoggingInfo.h" #include "SWGErrorResponse.h" #include "maincore.h" @@ -138,6 +139,22 @@ int WebAPIAdapterSrv::instanceChannels( return 200; } +int WebAPIAdapterSrv::instanceLoggingGet( + SWGSDRangel::SWGLoggingInfo& response, + SWGSDRangel::SWGErrorResponse& error __attribute__((unused))) +{ + response.setDumpToFile(m_mainCore.m_logger->getUseFileLogger() ? 1 : 0); + + if (response.getDumpToFile()) { + m_mainCore.m_logger->getLogFileName(*response.getFileName()); + m_mainCore.m_logger->getFileMinMessageLevelStr(*response.getFileLevel()); + } + + m_mainCore.m_logger->getConsoleMinMessageLevelStr(*response.getConsoleLevel()); + + return 200; +} + void WebAPIAdapterSrv::getDeviceSetList(SWGSDRangel::SWGDeviceSetList* deviceSetList) { deviceSetList->init(); diff --git a/sdrsrv/webapi/webapiadaptersrv.h b/sdrsrv/webapi/webapiadaptersrv.h index 5baf3985e..8ef65f7d3 100644 --- a/sdrsrv/webapi/webapiadaptersrv.h +++ b/sdrsrv/webapi/webapiadaptersrv.h @@ -50,6 +50,10 @@ public: SWGSDRangel::SWGInstanceChannelsResponse& response, SWGSDRangel::SWGErrorResponse& error); + virtual int instanceLoggingGet( + SWGSDRangel::SWGLoggingInfo& response, + SWGSDRangel::SWGErrorResponse& error); + private: MainCore& m_mainCore;