From c854a7fa681dd53ce5952fa219df8dd965fbcc37 Mon Sep 17 00:00:00 2001 From: HanzZ Date: Tue, 30 Oct 2012 18:06:29 +0100 Subject: [PATCH 1/2] Do not send subscribed on probe presence. Just subscribe should be enough --- spectrum/src/sample.cfg | 2 +- src/usermanager.cpp | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/spectrum/src/sample.cfg b/spectrum/src/sample.cfg index 2e412b69..d795b60e 100644 --- a/spectrum/src/sample.cfg +++ b/spectrum/src/sample.cfg @@ -13,7 +13,7 @@ admin_password=test #cert=server.pfx #patch to PKCS#12 certificate #cert_password=test #password to that certificate if any users_per_backend=10 -backend=../..//backends/libpurple/spectrum2_libpurple_backend +backend=../..//backends/swiften/spectrum2_swiften_backend #backend=../../backends/twitter/spectrum2_twitter_backend #backend=/home/hanzz/code/libtransport/backends/libcommuni/spectrum2_libcommuni_backend protocol=prpl-jabber diff --git a/src/usermanager.cpp b/src/usermanager.cpp index 20247ba8..64e1d1c3 100644 --- a/src/usermanager.cpp +++ b/src/usermanager.cpp @@ -203,12 +203,6 @@ void UserManager::handlePresence(Swift::Presence::ref presence) { response->setFrom(presence->getTo()); response->setType(Swift::Presence::Subscribe); m_component->getStanzaChannel()->sendPresence(response); - - response = Swift::Presence::create(); - response->setTo(presence->getFrom()); - response->setFrom(presence->getTo()); - response->setType(Swift::Presence::Subscribed); - m_component->getStanzaChannel()->sendPresence(response); } // Set user offline in database From 3dc0598886da122488a123e81630960d580bbfb3 Mon Sep 17 00:00:00 2001 From: HanzZ Date: Tue, 30 Oct 2012 19:33:13 +0100 Subject: [PATCH 2/2] Logging docs update --- docs/guide/logging.textile | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/docs/guide/logging.textile b/docs/guide/logging.textile index fa1c9640..49052811 100644 --- a/docs/guide/logging.textile +++ b/docs/guide/logging.textile @@ -95,7 +95,7 @@ log4j.additivity.Component.XML=false # Create new RollingFileAppender logger and set the file name log4j.appender.XML=org.apache.log4j.RollingFileAppender -log4j.appender.XML.File=/var/log/spectrum2/${jid}/spectrum2.log +log4j.appender.XML.File=/var/log/spectrum2/${jid}/spectrum2_xml.log # Set MaxFileSize. Log will be rotated automatically when this limit is reached log4j.appender.XML.MaxFileSize=100000KB @@ -107,6 +107,25 @@ log4j.appender.XML.layout=org.apache.log4j.PatternLayout log4j.appender.XML.layout.ConversionPattern=%d %-5p %c: %m%n +h3. Disable XML logging + +
+# We create two rootLoggers:
+#   - "debug" is internal logger used by log4cxx
+#   - "stdout" is name of our ConsoleAppender logger
+log4j.rootLogger=debug, stdout
+
+# Create new ConsoleAppender logger with custom PatternLayout
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+
+# Define the output pattern. Characters are mentioned here: http://logging.apache.org/log4cxx/apidocs/classlog4cxx_1_1_pattern_layout.html
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=%d %-5p %c: %m%n
+
+# Disable XML category
+log4j.category.Component.XML = OFF
+
+ h3. Disable logging To disable logging, you still *must have* one logger created (probably the ConsoleAppender), but you can set log4j.threshold = OFF to not log everything later: