base catalog version on ChronoSync
* remove the redundant TableColumns in publishAdapter
* share chonosync::Socket in adapters to allow queryAdapter to use digest as version
* add various levels of log messages
refs: #2770
Change-Id: Id5aca0f84d9b7963fc63bf0329fbc6394f2b5777
diff --git a/log4cxx.properties b/log4cxx.properties
index 3144df3..cdf2386 100644
--- a/log4cxx.properties
+++ b/log4cxx.properties
@@ -1,22 +1,21 @@
-# Set root logger level to DEBUG and its only appender to R.
-log4j.rootLogger=ERROR, R
+# Please refer to https://logging.apache.org/log4cxx/usage.html for option details
-log4j.appender.R=org.apache.log4j.RollingFileAppender
-log4j.appender.R.File=example.log
-log4j.appender.R.MaxFileSize=100KB
+log4j.rootLogger=INFO, rootConsoleAppender, rootFileAppender
-log4j.appender.R.layout=org.apache.log4j.PatternLayout
-log4j.appender.R.layout.ConversionPattern=%d{hh:mm:ss,SSS} %-14t %-14c %m%n
+# rootConsoleAppender prints out messages to console
+log4j.appender.rootConsoleAppender=org.apache.log4j.ConsoleAppender
+log4j.appender.rootConsoleAppender.layout=org.apache.log4j.PatternLayout
+log4j.appender.rootConsoleAppender.layout.ConversionPattern=%d %-5p [%c] - %m%n
-# R is set to be a ConsoleAppender.
-#log4j.appender.R=org.apache.log4j.ConsoleAppender
+# rootFileAppender dumps messages to a file
+#log4j.appender.rootFileAppender=org.apache.log4j.FileAppender
+log4j.appender.rootFileAppender=org.apache.log4j.RollingFileAppender
+log4j.appender.rootFileAppender.layout=org.apache.log4j.PatternLayout
+log4j.appender.rootFileAppender.layout.ConversionPattern=%d %-5p [%c] - %m%n
+log4j.appender.rootFileAppender.File=catalog.log
+log4j.appender.rootFileAppender.MaxFileSize=100KB
-# R uses PatternLayout.
-#log4j.appender.R.layout=org.apache.log4j.PatternLayout
-#log4j.appender.R.target=System.err
-#log4j.appender.R.layout.ConversionPattern=%d{dd-MMM HH:MM:SS,SSS} %p %c %m%n
-#log4j.appender.R.layout.ConversionPattern=%d{hh:mm:ss,SSS} %-14t %-14c %m%n
-#log4j.appender.R.layout.ConversionPattern=%d{ss,SSS} %-12c %m%n
+# Change the log level (INFO, DEBUG, etc.) here
+log4j.logger.QueryAdapter=INFO
+log4j.logger.PublishAdapter=INFO
-log4j.logger.QueryAdapter = DEBUG
-log4j.logger.PublishAdapter = DEBUG