libtransport.git Changeset - 2b9c095d0e85

Changeset - 2b9c095d0e85

Parent rev.

Child rev.

[Not reviewed]

Merge

0 14 0

Jan Kaluza - 13 years ago 2012-10-31 09:17:09
hanzz.k@gmail.com

Merge branch 'master' of github.com:hanzz/libtransport

3 files changed with 21 insertions and 8 deletions:

docs/guide/logging.textile

spectrum/src/sample.cfg

src/usermanager.cpp

0 comments (0 inline, 0 general)

docs/guide/logging.textile

➞

Show inline comments

@@ @@ -92,24 +92,43 @@ log4j.category.Component.XML = debug, XML @@
 # Do not add XML category into "R" logger, so XML category will be logged only to spectrum2_xml.log, but not to spectrum2.log.
 # If you want to have XML category also in spectrum2.log, set this value to "true"
 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
 # Keep one backup file
 log4j.appender.XML.MaxBackupIndex=4
 # Define the output pattern. Characters are mentioned here: http://logging.apache.org/log4cxx/apidocs/classlog4cxx_1_1_pattern_layout.html
 log4j.appender.XML.layout=org.apache.log4j.PatternLayout
 log4j.appender.XML.layout.ConversionPattern=%d %-5p %c: %m%n
 </pre>
 h3. Disable XML logging
 <pre>
 # 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
 </pre>
 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:
 <pre>
 # We create two rootLoggers:

spectrum/src/sample.cfg

➞

Show inline comments

@@ @@ -10,13 +10,13 @@ pidfile=./test.pid @@
 #backend_port=10001
 #admin_jid=admin@localhost
 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
 #protocol=prpl-msn
 #protocol=any
 #protocol=prpl-icq

src/usermanager.cpp

➞

Show inline comments

 			if (/*registered && */presence->getType() == Swift::Presence::Probe) {
 				Swift::Presence::ref response = Swift::Presence::create();
 				response->setTo(presence->getFrom());
 				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
 			if (m_storageBackend) {
 				UserInfo res;
 				bool registered = m_storageBackend->getUser(userkey, res);

0 comments (0 inline, 0 general)