log4cpp-commits — Commit hooks mail list

[Log4cpp-commits] [git push]Log4cpp Git repository. branch, master, updated. REL_0_2_6_RC1-480-g8137f57

[Alexander P. <no...@so...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Log4cpp Git repository.".

The branch, master has been updated
       via  8137f57ba1e88d1e08955de68634561024b1566e (commit)
      from  7a0444dfc5927464ec2e788122310da356f35754 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sourceforge.net/p/log4cpp/codegit/ci/

commit 8137f57ba1e88d1e08955de68634561024b1566e
Author: Alexander Perepelkin <san...@us...>
Date:   Thu Dec 5 17:14:59 2013 +0400

    fix for bug#137, for strings longer than 256 chars, and test for this case

diff --git a/src/Properties.cpp b/src/Properties.cpp
index e27c2cb..795411c 100644
--- a/src/Properties.cpp
+++ b/src/Properties.cpp
@@ -25,10 +25,23 @@ namespace log4cpp {
         std::string leftSide, rightSide;
         char line[256];
         std::string::size_type length;
-
-        while (in.getline(line, 256)) {
-            fullLine = line;
-
+        bool partiallyRead(false);	// fix for bug#137, for strings longer than 256 chars
+
+        while (in) {
+        	if (in.getline(line, 256) || !in.bad()) {
+        		// either string is read fully or only partially (logical but not read/write error)
+        		if (partiallyRead)
+        			fullLine.append(line);
+        		else
+        			fullLine = line;
+        		partiallyRead = (in.fail() && !in.bad());
+        		if (partiallyRead && !in.eof()) {
+        			in.clear(in.rdstate() & ~std::ios::failbit);
+        			continue; // to get full line
+        		}
+        	} else {
+       			break;
+        	}
             /* if the line contains a # then it is a comment
                if we find it anywhere other than the beginning, then we assume 
                there is a command on that line, and it we don't find it at all
diff --git a/tests/testConfig.log4cpp.properties b/tests/testConfig.log4cpp.properties
index 65719f7..3e43e74 100644
--- a/tests/testConfig.log4cpp.properties
+++ b/tests/testConfig.log4cpp.properties
@@ -4,8 +4,10 @@ log4j.rootCategory=DEBUG, rootAppender
 log4j.category.sub1=,A1
 log4j.category.sub2=INFO
 log4j.category.sub1.sub2=ERROR, A2
+log4j.category.sub1.sub2.sub3=INFO, A4, A5, A6, A7, A8
 
 log4j.additivity.sub1.sub2=false
+log4j.additivity.sub1.sub2.sub3=false
 
 log4j.appender.rootAppender=org.apache.log4j.ConsoleAppender
 log4j.appender.rootAppender.layout=org.apache.log4j.BasicLayout
@@ -16,4 +18,40 @@ log4j.appender.A1.layout=org.apache.log4j.SimpleLayout
 
 log4j.appender.A2=org.apache.log4j.ConsoleAppender
 log4j.appender.A2.layout=org.apache.log4j.PatternLayout
-log4j.appender.A2.layout.ConversionPattern=The message '%m' at time %d%n
+log4j.appender.A2.layout.ConversionPattern=The message '%m' at time %d%n 
+
+# tests for looong strings within the config file  
+log4cpp.appender.A4=RollingFileAppender
+log4cpp.appender.A4.fileName=A4.log
+log4cpp.appender.A4.maxFileSize=10240
+log4cpp.appender.A4.maxBackupIndex=1
+log4cpp.appender.A4.layout=PatternLayout
+log4cpp.appender.A4.layout.ConversionPattern=The message %m at time %d{%H:%M}%n is going to be very loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong%n
+
+log4cpp.appender.A5=RollingFileAppender
+log4cpp.appender.A5.fileName=A4.log
+log4cpp.appender.A5.maxFileSize=10240
+log4cpp.appender.A5.maxBackupIndex=1
+log4cpp.appender.A5.layout=PatternLayout
+log4cpp.appender.A5.layout.ConversionPattern=The message %m at time %d{%H:%M}%n is going to be very loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooongg%n
+
+log4cpp.appender.A6=RollingFileAppender
+log4cpp.appender.A6.fileName=A4.log
+log4cpp.appender.A6.maxFileSize=10240
+log4cpp.appender.A6.maxBackupIndex=1
+log4cpp.appender.A6.layout=PatternLayout
+log4cpp.appender.A6.layout.ConversionPattern=The message %m at time %d{%H:%M}%n is going to be very loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooonggg%n
+
+log4cpp.appender.A7=RollingFileAppender
+log4cpp.appender.A7.fileName=A4.log
+log4cpp.appender.A7.maxFileSize=10240
+log4cpp.appender.A7.maxBackupIndex=1
+log4cpp.appender.A7.layout=PatternLayout
+log4cpp.appender.A7.layout.ConversionPattern=The message %m at time %d{%H:%M}%n is going to be very loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooongggeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeer%n
+
+log4cpp.appender.A8=RollingFileAppender
+log4cpp.appender.A8.fileName=A4.log
+log4cpp.appender.A8.maxFileSize=10240
+log4cpp.appender.A8.maxBackupIndex=1
+log4cpp.appender.A8.layout=PatternLayout
+log4cpp.appender.A8.layout.ConversionPattern=The message %m at time %d{%H:%M}%n is going to be very loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooongggeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeer%n
diff --git a/tests/testPropertyConfig.cpp b/tests/testPropertyConfig.cpp
index 52c6a25..d633391 100644
--- a/tests/testPropertyConfig.cpp
+++ b/tests/testPropertyConfig.cpp
@@ -67,6 +67,9 @@ int main(int argc, char* argv[])
     log4cpp::Category& sub2 = 
         log4cpp::Category::getInstance(std::string("sub1.sub2"));
 
+    log4cpp::Category& sub3 =
+        log4cpp::Category::getInstance(std::string("sub1.sub2.sub3"));
+
     root.error("root error");
     root.warn("root warn");
     sub1.error("sub1 error");
@@ -96,6 +99,8 @@ int main(int argc, char* argv[])
     sub2 << log4cpp::Priority::WARN << "warn2.." << "..warn3..value=" << 0 
          << log4cpp::eol << "..warn4";
 
+    sub3 << log4cpp::Priority::INFO << "Very long config string follows";
+
     log4cpp::Category::shutdown();
 
     return 0;

-----------------------------------------------------------------------

Summary of changes:
 src/Properties.cpp                  |   19 ++++++++++++++--
 tests/testConfig.log4cpp.properties |   40 ++++++++++++++++++++++++++++++++++-
 tests/testPropertyConfig.cpp        |    5 ++++
 3 files changed, 60 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
Log4cpp Git repository.

[Log4cpp-commits] [git push]Log4cpp Git repository. branch master updated. REL_0_2_6_RC1-479-g7a0444d

[Alexander P. <san...@sh...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Log4cpp Git repository.".

The branch, master has been updated
      from  7a0444dfc5927464ec2e788122310da356f35754 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:


hooks/post-receive
-- 
Log4cpp Git repository.

[Log4cpp-commits] [git push]Log4cpp Git repository. branch master updated. REL_0_2_6_RC1-479-g7a0444d

[Alexander P. <san...@sh...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Log4cpp Git repository.".

The branch, master has been updated
      from  7a0444dfc5927464ec2e788122310da356f35754 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:


hooks/post-receive
-- 
Log4cpp Git repository.

[Log4cpp-commits] [git push]UNNAMED PROJECT branch, master, updated. REL_0_2_6_RC1-479-g7a0444d

[Alexander P. <no...@so...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "UNNAMED PROJECT".

The branch, master has been updated
       via  7a0444dfc5927464ec2e788122310da356f35754 (commit)
      from  bdaf79f494ee0e2b413eaab75b3b80b1cf40c362 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sourceforge.net/p/log4cpp/codegit/ci/

commit 7a0444dfc5927464ec2e788122310da356f35754
Author: sanchouss_ <san...@us...>
Date:   Wed Nov 27 18:37:34 2013 +0400

    First git commit

diff --git a/ChangeLog b/ChangeLog
index 1321dde..11a5797 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2012-10-15 18:48  sanchouss_
 	
+	* Migrated from cvs to git scm. Url is ssh://USE...@gi.../p/log4cpp/codegit 
+
+	2012-10-15 18:48  sanchouss_
+	
 	* msvc10/ Converted solution for building from MSVC 2010 with small adjustments. Output is targeted 
 	into building directory instead of system32 dir (due to windows UAC restrictions)
 	* src/RollingFileAppender.cpp - resolved ambiguity of log10

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
UNNAMED PROJECT