Merge pull request #621 from palexander/patch-1

Add colon to match common logger spec
rack · Nov 19, 2013 · 38d788d · 38d788d
2 parents df1506b + 65f75b4
commit 38d788d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/lib/rack/commonlogger.rb b/lib/rack/commonlogger.rb
@@ -46,7 +46,7 @@ def log(env, status, header, began_at)
       logger.write FORMAT % [
         env['HTTP_X_FORWARDED_FOR'] || env["REMOTE_ADDR"] || "-",
         env["REMOTE_USER"] || "-",
-        now.strftime("%d/%b/%Y %H:%M:%S %z"),
+        now.strftime("%d/%b/%Y:%H:%M:%S %z"),
         env["REQUEST_METHOD"],
         env["PATH_INFO"],
         env["QUERY_STRING"].empty? ? "" : "?"+env["QUERY_STRING"],

diff --git a/test/spec_commonlogger.rb b/test/spec_commonlogger.rb
@@ -67,7 +67,7 @@ def with_mock_time(t = 0)
     md = /- - - \[([^\]]+)\] "(\w+) \/ " (\d{3}) \d+ ([\d\.]+)/.match(log.string)
     md.should.not.equal nil
     time, method, status, duration = *md.captures
-    time.should.equal Time.at(0).strftime("%d/%b/%Y %H:%M:%S %z")
+    time.should.equal Time.at(0).strftime("%d/%b/%Y:%H:%M:%S %z")
     method.should.equal "GET"
     status.should.equal "200"
     (0..1).should.include?(duration.to_f)