Merge pull request #332 from smartinez87/fix_timestamp

Fix timestamp error
smartinez87 · Jun 13, 2016 · eaa70f4 · eaa70f4
2 parents 5c2529e + 9bd8ad3
commit eaa70f4
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 4 deletions.
diff --git a/lib/exception_notifier/email_notifier.rb b/lib/exception_notifier/email_notifier.rb
@@ -1,4 +1,5 @@
 require "active_support/core_ext/hash/reverse_merge"
+require 'active_support/core_ext/time'
 require 'action_mailer'
 require 'action_dispatch'
 require 'pp'
@@ -33,6 +34,7 @@ def exception_notification(env, exception, options={}, default_options={})
             @kontroller = env['action_controller.instance'] || MissingController.new
             @request    = ActionDispatch::Request.new(env)
             @backtrace  = exception.backtrace ? clean_backtrace(exception) : []
+            @timestamp  = Time.current
             @sections   = @options[:sections]
             @data       = (env['exception_notifier.exception_data'] || {}).merge(options[:data] || {})
             @sections   = @sections + %w(data) unless @data.empty?
@@ -46,6 +48,7 @@ def background_exception_notification(exception, options={}, default_options={})
             @exception = exception
             @options   = options.reverse_merge(default_options)
             @backtrace = exception.backtrace || []
+            @timestamp = Time.current
             @sections  = @options[:background_sections]
             @data      = options[:data] || {}
 

diff --git a/lib/exception_notifier/views/exception_notifier/_request.html.erb b/lib/exception_notifier/views/exception_notifier/_request.html.erb
@@ -17,7 +17,7 @@
   </li>
   <li>
     <strong>Timestamp:</strong>
-    <span><%= Time.current %></span>
+    <span><%= @timestamp %></span>
   </li>
   <li>
     <strong>Server:</strong>

diff --git a/lib/exception_notifier/views/exception_notifier/_request.text.erb b/lib/exception_notifier/views/exception_notifier/_request.text.erb
@@ -2,7 +2,7 @@
 * HTTP Method: <%= raw @request.request_method %>
 * IP address : <%= raw @request.remote_ip %>
 * Parameters : <%= raw safe_encode @request.filtered_parameters.inspect %>
-* Timestamp  : <%= raw Time.current %>
+* Timestamp  : <%= raw @timestamp %>
 * Server : <%= raw Socket.gethostname %>
 <% if defined?(Rails) && Rails.respond_to?(:root) %>
 * Rails root : <%= raw Rails.root %>

diff --git a/lib/exception_notifier/views/exception_notifier/background_exception_notification.html.erb b/lib/exception_notifier/views/exception_notifier/background_exception_notification.html.erb
@@ -30,7 +30,7 @@
       <tr>
         <td style="padding: 10px; border: 1px solid #eed3d7; background-color: #f2dede">
           <h3 style="color: #b94a48">
-            <%= @exception.class.to_s =~ /^[aeiou]/i ? 'An' : 'A' %> <%= @exception.class %> occurred in background at <%= Time.current %> :
+            <%= @exception.class.to_s =~ /^[aeiou]/i ? 'An' : 'A' %> <%= @exception.class %> occurred in background at <%= @timestamp %> :
           </h3>
           <p style="color: #b94a48"><%= @exception.message %></p>
           <pre style="font-size: 12px; padding: 5px; background-color:#f5f5f5">

diff --git a/lib/exception_notifier/views/exception_notifier/background_exception_notification.text.erb b/lib/exception_notifier/views/exception_notifier/background_exception_notification.text.erb
@@ -1,4 +1,4 @@
-<%= @exception.class.to_s =~ /^[aeiou]/i ? 'An' : 'A' %> <%= @exception.class %> occurred in background at <%= raw Time.current %> :
+<%= @exception.class.to_s =~ /^[aeiou]/i ? 'An' : 'A' %> <%= @exception.class %> occurred in background at <%= raw @timestamp %> :
 
   <%= @exception.message %>
   <%= @backtrace.first %>

diff --git a/lib/exception_notifier/webhook_notifier.rb b/lib/exception_notifier/webhook_notifier.rb
@@ -1,4 +1,5 @@
 require 'action_dispatch'
+require 'active_support/core_ext/time'
 
 module ExceptionNotifier
   class WebhookNotifier < BaseNotifier