Merge pull request #10 from joshdvir/master

Adding a default time to environment vars
lbeder · Aug 18, 2016 · 8f8c0aa · 8f8c0aa
2 parents fea48ee + 4dfc65f
commit 8f8c0aa
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 6 deletions.
diff --git a/app/controllers/health_monitor/health_controller.rb b/app/controllers/health_monitor/health_controller.rb
@@ -10,10 +10,10 @@ class HealthController < ActionController::Base
     def check
       res = HealthMonitor.check(request: request)
 
-      unless HealthMonitor.configuration.environmet_variables.nil?
-        env_vars = [environmet_variables: HealthMonitor.configuration.environmet_variables]
-        res[:results] = env_vars + res[:results]
-      end
+      HealthMonitor.configuration.environmet_variables ||= {}
+      v = HealthMonitor.configuration.environmet_variables.merge(time: Time.now.to_s(:db))
+      env_vars = [environmet_variables: v]
+      res[:results] = env_vars + res[:results]
 
       self.content_type = Mime[:json]
       self.status = res[:status]

diff --git a/lib/health_monitor/version.rb b/lib/health_monitor/version.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module HealthMonitor
-  VERSION = '5.0.0'.freeze
+  VERSION = '5.0.1'.freeze
 end
diff --git a/spec/controllers/health_monitor/health_controller_spec.rb b/spec/controllers/health_monitor/health_controller_spec.rb
@@ -39,6 +39,9 @@
 
         expect(response).to be_ok
         expect(JSON.parse(response.body)).to eq([{
+          'environmet_variables' => { 'time' => '1990-01-01 00:00:00' }
+        },
+        {
           'database' => {
             'message' => '',
             'status' => 'OK',
@@ -87,7 +90,8 @@
             {
               'environmet_variables' => {
                 'build_number' => '12',
-                'git_sha' => 'example_sha'
+                'git_sha' => 'example_sha',
+                'time' => '1990-01-01 00:00:00'
               }
             },
             {
@@ -118,6 +122,9 @@
 
       expect(response).to be_ok
       expect(JSON.parse(response.body)).to eq([{
+        'environmet_variables' => { 'time' => '1990-01-01 00:00:00' }
+      },
+      {
         'database' => {
           'message' => '',
           'status' => 'OK',
@@ -138,6 +145,9 @@
 
         expect(response).to be_error
         expect(JSON.parse(response.body)).to eq([{
+          'environmet_variables' => { 'time' => '1990-01-01 00:00:00' }
+        },
+        {
           'database' => {
             'message' => 'Exception',
             'status' => 'ERROR',