Handling incorrect server type

Author: yzhoubk

lib/check_server.rb

@@ -5,15 +5,17 @@ class CheckServer
 
   class << self
     def geoserver(type)
-      check_type(type)
+      return wrong_type(type) unless %w[public UCB].include? type
+
       server_name = type == 'public' ? GEOSERVER_NAME : SECURE_GEOSERVER_NAME
       url = host_url(server_name)
       geoserver_url = url && "#{url.chomp('/')}/wms?service=WMS&request=GetCapabilities"
       OkComputer::Registry.register clr_msg(server_name), GeoDataHealthCheck::HttpHeadCheck.new(geoserver_url)
     end
 
     def spatial_server(type)
-      check_type(type)
+      return wrong_type(type) unless %w[public UCB].include? type
+
       msg = "#{type} #{SPATIAL_SERVER_NAME}"
       url = host_url(SPATIAL_SERVER_NAME)
       spatial_url = url && "#{url.chomp('/')}/#{type}/berkeley-status/data.zip"
@@ -28,8 +30,9 @@ def clr_msg(msg)
       msg.downcase.strip.gsub(/\s+/, '_')
     end
 
-    def check_type(type)
-      raise StandardError, "Incorrect server type #{type}, expect either 'public' or 'UCB'" unless %w[public UCB].include? type
+    def wrong_type(type)
+      msg = "Incorrect Geoserver or Spatial server type '#{type}', expect either 'public' or 'UCB"
+      OkComputer::Registry.register msg, GeoDataHealthCheck::HttpHeadCheck.new(' ')
     end
   end
 end

lib/http_head_check.rb

@@ -10,7 +10,7 @@ def initialize(url, request_timeout = 5)
     # rubocop:enable Lint/MissingSuper
 
     def check
-      return skip_check unless url
+      return skip_check if url.strip.empty?
 
       response = HttpClient.request(
         :head,