Martchus
/
syncthingtray
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Allow logging POSTs

This commit is contained in:
Martchus 2018-10-12 00:20:15 +02:00
parent 92b7943ac4
commit 00e0b58c86
2 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
connector/CMakeLists.txt
View File

@ -80,7 +80,7 @@ if(SYSTEMD_SUPPORT)
org.freedesktop.systemd1.Manager.xml
PROPERTIES INCLUDE syncthingservice.h
)
list(APPEND META_PUBLIC_COMPILE_DEFINITIONS LIB_SYNCTHING_CONNECTOR_SUPPORT_SYSTEMD)
list(APPEND META_PUBLIC_COMPILE_DEFINITIONS ${META_PROJECT_VARNAME_UPPER}_SUPPORT_SYSTEMD)
message(STATUS "systemd support enabled")
else()
message(STATUS "systemd support disabled")
@ -97,7 +97,7 @@ if(SYNCTHING_CONNECTION_MOCKED)
syncthingconnection.cpp
syncthingconnectionmockhelpers.h
syncthingconnectionmockhelpers.cpp
PROPERTIES COMPILE_DEFINITIONS LIB_SYNCTHING_CONNECTOR_CONNECTION_MOCKED
PROPERTIES COMPILE_DEFINITIONS ${META_PROJECT_VARNAME_UPPER}_CONNECTION_MOCKED
)
message(WARNING "SyncthingConnection class will be mocked")
endif()
@ -107,7 +107,7 @@ option(SYNCTHING_SERVICE_MOCKED "enables mocking the SyncthingService class so i
if(SYNCTHING_SERVICE_MOCKED)
set_source_files_properties(
syncthingservice.cpp
PROPERTIES COMPILE_DEFINITIONS LIB_SYNCTHING_CONNECTOR_SERVICE_MOCKED
PROPERTIES COMPILE_DEFINITIONS ${META_PROJECT_VARNAME_UPPER}_SERVICE_MOCKED
)
message(WARNING "SyncthingService class will be mocked")
endif()
@ -117,7 +117,17 @@ option(SYNCTHING_CONNECTION_LOG_SYNCTHING_EVENTS "enables logging event data to
if(SYNCTHING_CONNECTION_LOG_SYNCTHING_EVENTS)
set_source_files_properties(
syncthingconnection.cpp
PROPERTIES COMPILE_DEFINITIONS LIB_SYNCTHING_CONNECTOR_LOG_SYNCTHING_EVENTS
PROPERTIES COMPILE_DEFINITIONS ${META_PROJECT_VARNAME_UPPER}_LOG_SYNCTHING_EVENTS
)
message(WARNING "SyncthingConnection class will log event data to stdout")
endif()
# configure whether POSTs should be logged
option(SYNCTHING_CONNECTION_LOG_POSTS "enables logging POSTs done by the SyncthingConnector (enable only for debugging!)" OFF)
if(SYNCTHING_CONNECTION_LOG_POSTS)
set_source_files_properties(
syncthingconnection.cpp
PROPERTIES COMPILE_DEFINITIONS ${META_PROJECT_VARNAME_UPPER}_LOG_POSTS
)
message(WARNING "SyncthingConnection class will log event data to stdout")
endif()

7
connector/syncthingconnection.cpp
View File

@ -10,7 +10,7 @@
#include <c++utilities/conversion/conversionexception.h>
#include <c++utilities/conversion/stringconversion.h>
#ifdef LIB_SYNCTHING_CONNECTOR_LOG_SYNCTHING_EVENTS
#if defined(LIB_SYNCTHING_CONNECTOR_LOG_SYNCTHING_EVENTS) || defined(LIB_SYNCTHING_CONNECTOR_LOG_POSTS)
#include <c++utilities/io/ansiescapecodes.h>
#endif
@ -32,7 +32,7 @@
using namespace std;
using namespace ChronoUtilities;
using namespace ConversionUtilities;
#ifdef LIB_SYNCTHING_CONNECTOR_LOG_SYNCTHING_EVENTS
#if defined(LIB_SYNCTHING_CONNECTOR_LOG_SYNCTHING_EVENTS) || defined(LIB_SYNCTHING_CONNECTOR_LOG_POSTS)
using namespace EscapeCodes;
#endif
@ -470,6 +470,9 @@ QNetworkReply *SyncthingConnection::postData(const QString &path, const QUrlQuer
{
auto *reply = networkAccessManager().post(prepareRequest(path, query), data);
reply->ignoreSslErrors(m_expectedSslErrors);
#ifdef LIB_SYNCTHING_CONNECTOR_LOG_POSTS
cout << Phrases::Info << "POSTing:" << Phrases::End << data.data() << endl;
#endif
return reply;
}