You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by ts...@apache.org on 2017/10/16 09:56:44 UTC
[1/2] logging-log4cxx git commit: LOGCXX-493: Added granularity to
the docs of getTimeStamp.
Repository: logging-log4cxx
Updated Branches:
refs/heads/latest_stable 54ca0aec8 -> 7f8553c39
LOGCXX-493: Added granularity to the docs of getTimeStamp.
(cherry picked from commit eeb85de0474b75c2a8c1e027e48845d5790208b0)
Project: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/commit/7f8553c3
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/tree/7f8553c3
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/diff/7f8553c3
Branch: refs/heads/latest_stable
Commit: 7f8553c391548b6b5ea6f2616d2b769bc0fe3b76
Parents: 4862b01
Author: Thorsten Schöning <ts...@am-soft.de>
Authored: Mon Oct 16 11:33:01 2017 +0200
Committer: Thorsten Schöning <ts...@am-soft.de>
Committed: Mon Oct 16 11:53:01 2017 +0200
----------------------------------------------------------------------
src/main/include/log4cxx/spi/loggingevent.h | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/7f8553c3/src/main/include/log4cxx/spi/loggingevent.h
----------------------------------------------------------------------
diff --git a/src/main/include/log4cxx/spi/loggingevent.h b/src/main/include/log4cxx/spi/loggingevent.h
index 0147ecf..0162e90 100644
--- a/src/main/include/log4cxx/spi/loggingevent.h
+++ b/src/main/include/log4cxx/spi/loggingevent.h
@@ -109,7 +109,8 @@ namespace log4cxx
return threadName;
}
- /** Return the timeStamp of this event. */
+ /** The number of microseconds elapsed from 01.01.1970 until logging event
+ was created. */
inline log4cxx_time_t getTimeStamp() const
{ return timeStamp; }
[2/2] logging-log4cxx git commit: LOGCXX-493: LoggingEvent::timeStamp
and ::getStartTime were documented to provide milliseconds,
but are ultimately set using apr_time_now and that provides microseconds.
Additionally, RelativeTimeDateFormat was documente
Posted by ts...@apache.org.
LOGCXX-493: LoggingEvent::timeStamp and ::getStartTime were documented to provide milliseconds, but are ultimately set using apr_time_now and that provides microseconds. Additionally, RelativeTimeDateFormat was documented to provide seconds, but is based on getStartTime with microseconds and ttcclayout.h documents that RelativeTimeDateFormat provides milliseconds as well. So implementation of RelativeTimeDateFormat is the same like for RelativeTimePatternConverter, which documents to provide milliseconds, too.
(cherry picked from commit 4cf6ae6f16a307f242216b1c669c2d9213b82712)
# Conflicts:
# src/changes/changes.xml
Project: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/commit/4862b013
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/tree/4862b013
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4cxx/diff/4862b013
Branch: refs/heads/latest_stable
Commit: 4862b013de71973500d23dcd71eee58d8b8dc1f6
Parents: 54ca0ae
Author: Thorsten Schöning <ts...@am-soft.de>
Authored: Mon Oct 16 11:26:04 2017 +0200
Committer: Thorsten Schöning <ts...@am-soft.de>
Committed: Mon Oct 16 11:53:01 2017 +0200
----------------------------------------------------------------------
src/changes/changes.xml | 1 +
src/main/include/log4cxx/helpers/relativetimedateformat.h | 2 +-
src/main/include/log4cxx/spi/loggingevent.h | 4 ++--
3 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/4862b013/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 24f327a..cee1d34 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -228,6 +228,7 @@
<action issue="LOGCXX-257" type="fix">ServerSocket::accept hangs on Unix</action>
<action issue="LOGCXX-258" type="fix">unable to build from make dist package due to missing doxygen file</action>
<action issue="LOGCXX-259" type="fix">Several appenders fail to compile in Visual Studio 2008</action>
+ <action issue="LOGCXX-493" type="fix">Wrong usage of milli- vs. micro- and non- vs. milliseconds in some docs.</action>
</release>
<release version="0.9.7" date="2004-05-10">
<action type="fix">Fixed examples source code in the "Short introduction to log4cxx".</action>
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/4862b013/src/main/include/log4cxx/helpers/relativetimedateformat.h
----------------------------------------------------------------------
diff --git a/src/main/include/log4cxx/helpers/relativetimedateformat.h b/src/main/include/log4cxx/helpers/relativetimedateformat.h
index b60d62f..85daade 100644
--- a/src/main/include/log4cxx/helpers/relativetimedateformat.h
+++ b/src/main/include/log4cxx/helpers/relativetimedateformat.h
@@ -25,7 +25,7 @@ namespace log4cxx
namespace helpers
{
/**
- Formats a date by printing the number of seconds
+ Formats a date by printing the number of milliseconds
elapsed since the start of the application. This is the fastest
printing DateFormat in the package.
*/
http://git-wip-us.apache.org/repos/asf/logging-log4cxx/blob/4862b013/src/main/include/log4cxx/spi/loggingevent.h
----------------------------------------------------------------------
diff --git a/src/main/include/log4cxx/spi/loggingevent.h b/src/main/include/log4cxx/spi/loggingevent.h
index 25f5c0d..0147ecf 100644
--- a/src/main/include/log4cxx/spi/loggingevent.h
+++ b/src/main/include/log4cxx/spi/loggingevent.h
@@ -100,7 +100,7 @@ namespace log4cxx
{ return message; }
/**Returns the time when the application started,
- in seconds elapsed since 01.01.1970.
+ in microseconds elapsed since 01.01.1970.
*/
static log4cxx_time_t getStartTime();
@@ -226,7 +226,7 @@ namespace log4cxx
LogString message;
- /** The number of milliseconds elapsed from 1/1/1970 until logging event
+ /** The number of microseconds elapsed from 01.01.1970 until logging event
was created. */
log4cxx_time_t timeStamp;