summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-08-25 03:56:53 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-08-25 03:56:53 +0000
commit51560a87375d4ead3e6859ba13e253d185bcdf99 (patch)
treea240afb54dfb7322b724f60ffe43059593aaf941
parent4f662fe74f326d899b416b6954aba4cf76f8abb4 (diff)
lib/logger.rb: use %N
* lib/logger.rb (format_datetime): use "%6N" to show microsecond. [Fix GH-704] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47271 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--lib/logger.rb2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index d16b8313c8..4ed5cbb89a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Aug 25 12:56:54 2014 Ivan Korunkov <ivankorunkov@ya.ru>
+
+ * lib/logger.rb (format_datetime): use "%6N" to show microsecond.
+ [Fix GH-704]
+
Mon Aug 25 11:02:07 2014 Eric Wong <e@80x24.org>
* vm_core.h (rb_iseq_location_t): change first_lineno type to VALUE
diff --git a/lib/logger.rb b/lib/logger.rb
index 14443157cc..9b8bac8e48 100644
--- a/lib/logger.rb
+++ b/lib/logger.rb
@@ -511,7 +511,7 @@ private
def format_datetime(time)
if @datetime_format.nil?
- time.strftime("%Y-%m-%dT%H:%M:%S.") << "%06d " % time.usec
+ time.strftime("%Y-%m-%dT%H:%M:%S.%6N ")
else
time.strftime(@datetime_format)
end