From da42bfa8ac30972d4f3310caf63080e8efa8f7fb Mon Sep 17 00:00:00 2001
From: Chris Roberts <croberts@hashicorp.com>
Date: Wed, 13 Dec 2017 17:05:51 -0800
Subject: [PATCH] Provide optional timestamp on log output

Enable log message output to be prefixed with the date and time.
Include CLI flag to optionally enable `--timestamp` and a
convenience flag to enable debug logging with timestamps at
the same time `--debug-timestamp`.
---
 bin/vagrant    | 13 +++++++++++++
 lib/vagrant.rb |  6 ++++++
 2 files changed, 19 insertions(+)

diff --git a/bin/vagrant b/bin/vagrant
index 19df75033..7006adb23 100755
--- a/bin/vagrant
+++ b/bin/vagrant
@@ -52,6 +52,19 @@ if argv.include?("--debug")
   ENV["VAGRANT_LOG"] = "debug"
 end
 
+# Enable log timestamps if requested
+if argv.include?("--timestamp")
+  argv.delete("--timestamp")
+  ENV["VAGRANT_LOG_TIMESTAMP"] = "1"
+end
+
+# Convenience flag to enable debug with timestamps
+if argv.include?("--debug-timestamp")
+  argv.delete("--debug-timestamp")
+  ENV["VAGRANT_LOG"] = "debug"
+  ENV["VAGRANT_LOG_TIMESTAMP"] = "1"
+end
+
 # Stdout/stderr should not buffer output
 $stdout.sync = true
 $stderr.sync = true
diff --git a/lib/vagrant.rb b/lib/vagrant.rb
index 897f27b88..3b6694947 100644
--- a/lib/vagrant.rb
+++ b/lib/vagrant.rb
@@ -41,6 +41,12 @@ if ENV["VAGRANT_LOG"] && ENV["VAGRANT_LOG"] != ""
     logger = Log4r::Logger.new("vagrant")
     logger.outputters = Log4r::Outputter.stderr
     logger.level = level
+    if ENV["VAGRANT_LOG_TIMESTAMP"]
+      Log4r::Outputter.stderr.formatter = Log4r::PatternFormatter.new(
+        pattern: "%d [%5l] %m",
+        date_pattern: "%F %T"
+      )
+    end
     logger = nil
   end
 end