doctor 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 18197643e4b8cd0d0ff9ccafb49e6b2040a6bf59
-  data.tar.gz: 0a9e698f2b4a8e49713479bd3dcf56e1a8af5cdf
+  metadata.gz: 25a482297d4b6c6c5f12486f82d089a2d8a74cc8
+  data.tar.gz: d70df0dad716978a8bfbcfde8d6e0be5b20d9e68
 SHA512:
-  metadata.gz: daefc650c78da2bcd1f5af3f350edbfe538ae3526fce3af8802fc0388d9d60d436c4bc36d0145c4b59d8848a603381b2f2726eebc8cfba26b651b098f51ff7b9
-  data.tar.gz: 22794a5e9d90673893481ea5d5da282b40ac64a89824e1b70a8bdb5dd250f577214682ce776cacb1daac5e23ea4cf199646d8006aeafae4700bce067a2429ffe
+  metadata.gz: bd87daf8fcf1b5455526aa679e4fa3e3366991b7c747330877f4e98bbff160a6d31629032e3291d023e3e05732896a76783f2bdec2fb631eaddda64421999ac7
+  data.tar.gz: 84ce81d31354588361cc12d3af86974c092d1cdd1921933caa292bdc1b1d661b113fe9957c176e7c5efd80eb11818c5c8072b26371cc5df9b5cdf91b8753b7ad

data/app/analyser/doctor/telnet_analyser.rb

@@ -17,6 +17,7 @@ module Doctor
     end
 
     private
+
     def validate_telnet_connection(url)
       result = build_result(url)
 
@@ -48,10 +49,10 @@ module Doctor
 
     def execute_telnet(url)
       Net::Telnet::new(
-        "Host" => url[:host],
-        "Port" => url[:port] || DEFAULT_PORT,
-        "Timeout" => url[:timeout] || DEFAULT_TIMEOUT,
-        "Waittime" => url[:wait_time] || DEFAULT_WAIT_TIME
+        'Host' => url[:host],
+        'Port' => url[:port] || DEFAULT_PORT,
+        'Timeout' => url[:timeout] || DEFAULT_TIMEOUT,
+        'Waittime' => url[:wait_time] || DEFAULT_WAIT_TIME
       )
     end
   end

data/app/controllers/doctor/health_check_controller.rb

@@ -3,7 +3,13 @@ module Doctor
     def index
       check_result = HealthCheck.new.perform
 
-      status = check_result.has_error? ? :internal_server_error : :ok
+      if check_result.has_error?
+        errors = check_result.error_messages
+        Rails.logger.error(errors)
+        status = :internal_server_error
+      else
+        status = :ok
+      end
 
       render json: check_result.result, status: status
     end

data/app/use_case/doctor/health_check.rb

@@ -7,16 +7,23 @@ module Doctor
       result[:databases] = analyze_database
       result[:hds] = analyse_hds
 
-      OpenStruct.new(result: result, has_error?: has_error?(result))
+      error_messages = list_all_error_messages(result)
+
+      OpenStruct.new(
+        result: result,
+        has_error?: has_error?(result),
+        error_messages: error_messages
+      )
     end
 
     private
+
     def analyze_telnet
       process(TelnetAnalyser, Dto::TelnetResultDto)
     end
 
     def analyze_database
-     process(DatabaseAnalyser, Dto::DatabaseResultDto)
+      process(DatabaseAnalyser, Dto::DatabaseResultDto)
     end
 
     def analyse_hds
@@ -35,16 +42,28 @@ module Doctor
       dto_result
     end
 
-    def has_error?(result_hash)
-      result_hash.values.each do |result_analyze|
+    def has_error?(result) # rubocop:disable Style/PredicateName
+      result.values.each do |result_analyze|
         result_analyze.each do |result|
-          if !result.status.eql?('ok')
-            return true
-          end
+          return true unless result.status.eql?('ok')
         end
       end
 
       false
     end
+
+    def list_all_error_messages(result)
+      errors = []
+
+      result.values.each do |result_analyze|
+        result_analyze.each do |result|
+          next if result.status.eql?('ok')
+
+          errors << result.error_message
+        end
+      end
+
+      errors
+    end
   end
 end

data/app/view/doctor/dto/database_result_dto.rb

@@ -2,6 +2,7 @@ module Doctor
   module Dto
     class DatabaseResultDto
       attr_reader :status
+      attr_reader :error_message
 
       def initialize(data)
         @status = data[:status]

data/app/view/doctor/dto/hd_result_dto.rb

@@ -2,6 +2,7 @@ module Doctor
   module Dto
     class HdResultDto
       attr_reader :status
+      attr_reader :error_message
 
       def initialize(data)
         @name = data[:name]

data/app/view/doctor/dto/telnet_result_dto.rb

@@ -2,6 +2,7 @@ module Doctor
   module Dto
     class TelnetResultDto
       attr_reader :status
+      attr_reader :error_message
 
       def initialize(data)
         @name = data[:name]

data/lib/doctor/version.rb

@@ -1,3 +1,3 @@
 module Doctor
-  VERSION = '0.5.0'
+  VERSION = '0.6.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: doctor
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - uaiHebert
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-29 00:00:00.000000000 Z
+date: 2016-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties