Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/SpectrumIM/spectrum2.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhimselfv <me@boku.ru>2019-05-05 19:22:05 +0300
committervitalyster <vitalyster@gmail.com>2019-06-01 18:19:56 +0300
commit409a82757d5cf43f42020e1235750518adba01e2 (patch)
tree17eaf4bcd118be3cc32f004cb48f02f20b0e2530 /libtransport
parentd5c2b8edc00c12cd43cc4c3fd6e0662e3567d33e (diff)
Less logging
Diffstat (limited to 'libtransport')
-rw-r--r--libtransport/NetworkPluginServer.cpp8
1 files changed, 2 insertions, 6 deletions
diff --git a/libtransport/NetworkPluginServer.cpp b/libtransport/NetworkPluginServer.cpp
index 84544bbd..104dd7bd 100644
--- a/libtransport/NetworkPluginServer.cpp
+++ b/libtransport/NetworkPluginServer.cpp
@@ -1847,12 +1847,9 @@ std::vector<SWIFTEN_SHRPTR_NAMESPACE::shared_ptr<Swift::Message> >
NetworkPluginServer::wrapIncomingImage(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr<Swift::Message>& msg, const pbnetwork::ConversationMessage& payload) {
static boost::regex image_expr("<img src=[\"']([^\"']+)[\"'].*>");
- LOG4CXX_TRACE(logger, "wrapIncomingImage");
-
//Quick exit
std::vector<SWIFTEN_SHRPTR_NAMESPACE::shared_ptr<Swift::Message> > result;
if (payload.xhtml().find("<img") == std::string::npos) {
- LOG4CXX_TRACE(logger, "simple case, no images, returning as is");
result.push_back(msg);
return result;
}
@@ -1864,8 +1861,6 @@ NetworkPluginServer::wrapIncomingImage(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr<Swif
// This is not required by XEP and we lose parts of plaintext (e.g. captions).
bool singleOobMode = CONFIG_BOOL_DEFAULTED(m_config, "service.oob_replace_body", false);
- LOG4CXX_TRACE(logger, "splitMode: " << splitMode << ", singleOobMode: " << singleOobMode);
-
bool matchCount = 0;
std::string firstUrl;
@@ -1875,6 +1870,7 @@ NetworkPluginServer::wrapIncomingImage(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr<Swif
const std::string& body = payload.message();
std::string::size_type body_pos = 0;
+ LOG4CXX_TRACE(logger, "wrapIncomingImage: splitMode: " << splitMode << ", singleOobMode: " << singleOobMode);
LOG4CXX_TRACE(logger, "xhtml = " << xhtml);
LOG4CXX_TRACE(logger, "body = " << body);
@@ -1942,7 +1938,7 @@ NetworkPluginServer::wrapIncomingImage(SWIFTEN_SHRPTR_NAMESPACE::shared_ptr<Swif
xhtml_pos = match[0].second;
}
- //Post the remainder text
+ //Post the text remainder
if (splitMode && (xhtml_pos != xhtml.end())) {
std::string xhtml_prev(xhtml_pos, xhtml.end());
xhtml_trim(xhtml_prev);