Several log updates

lib/ether.rb

@@ -68,15 +68,15 @@ def server_init_opts
   end
 
   def load_server
-    logger('debug', 'ether/initialize') { "server #{@toolshck_server.nil? ? 'is not' : 'already'} initialized" }
+    logger('debug', 'ether/load_server') { "server #{@toolshck_server.nil? ? 'is not' : 'already'} initialized" }
     @toolshck_server ||= Server.new(server_init_opts)
     @toolshck_server.run_server
   end
 
   def load_ether
-    logger('debug', 'ether/initialize') { 'waiting for client acceptance' }
+    logger('debug', 'ether/load_ether') { 'waiting for client acceptance' }
     wait_for_client_acceptance
-    logger('debug', 'ether/initialize') { 'connected' }
+    logger('info', 'ether/load_ether') { 'connected' }
     @loaded = true
   end
 
@@ -85,11 +85,11 @@ def wait_for_client_acceptance
 
     unless fetch_output_with_timeout(@connection_timeout).eql?('START')
       e_message = 'something went wrong, didn\'t receive (START)'
-      raise EtherError.new('ether/initialize'), e_message
+      raise EtherError.new('ether/wait_for_client_acceptance'), e_message
     end
   rescue StandardError
     e_message = 'waiting for the client acceptance timed out'
-    raise EtherError.new('ether/initialize'), e_message
+    raise EtherError.new('ether/wait_for_client_acceptance'), e_message
   end
 
   def connect

lib/rtoolsHCK.rb

@@ -191,7 +191,7 @@ def start_studio_service(service_name)
   def start_studio_services
     services = %w[WTTServer HLKsvc DTMService WttChangeScheduler]
     services.each { |service_name| start_studio_service(service_name) }
-    logger('debug', 'HLK Services started successfully')
+    logger('info', 'HLK Services started successfully')
   end
 
   def start_client_service(machine, service_name)
@@ -262,12 +262,12 @@ def winrm_options_factory(addr, port, user, pass)
   end
 
   def load_winrm_ps
-    logger('debug', 'initialize/winrm') { 'loading winrm shell...' }
+    logger('debug', 'initialize/load_winrm_ps') { 'loading winrm shell...' }
     @connection_options = winrm_options_factory(@addr, 5985, @user, @pass)
     @connection = WinRM::Connection.new(@connection_options)
     @winrm_ps = @connection.shell(:powershell)
     run('date')
-    logger('debug', 'initialize/winrm') { 'winrm shell loaded!' }
+    logger('info', 'initialize/load_winrm_ps') { 'winrm shell loaded!' }
   end
 
   def check_run_output(run_output, where, cmd)
@@ -306,11 +306,11 @@ def machine_run(machine, cmd)
   end
 
   def load_winrm_fs
-    logger('debug', 'initialize/winrm') do
+    logger('debug', 'initialize/load_winrm_fs') do
       'creating winrm file manager instance'
     end
     @winrm_fs = WinRM::FS::FileManager.new(@connection)
-    logger('debug', 'initialize/winrm') do
+    logger('info', 'initialize/load_winrm_fs') do
       'winrm file manager instance created!'
     end
   end
@@ -1438,15 +1438,16 @@ def priv_close
   end
 
   def unload_winrm_ps
-    logger('debug', 'close/winrm') { 'unloading winrm shell...' }
+    logger('debug', 'close/unload_winrm_ps') { 'unloading winrm shell...' }
     @winrm_ps&.close
-    logger('debug', 'close/winrm') { 'winrm shell unloaded!' }
+    logger('debug', 'close/unload_winrm_ps') { 'winrm shell unloaded!' }
   rescue StandardError => e
     log_exception(e, 'warn')
   end
 
   def unload_ether
     @toolshck_ether&.close
+    logger('debug', 'close/unload_ether') { 'ether unloaded!' }
   rescue StandardError => e
     log_exception(e, 'warn')
   end
@@ -1494,7 +1495,7 @@ def close_and_shutdown
       unload_toolshck
       shutdown
       unload_winrm_ps
-      logger('debug', 'close') { 'done!' }
+      logger('info', 'close_and_shutdown') { 'done!' }
       @closed = true
       @json ? { 'result' => 'Success' } : true
     end
@@ -1507,7 +1508,7 @@ def close_and_shutdown
   def close
     handle_action_exceptions(__method__) do
       priv_close
-      logger('debug', 'close') { 'done!' }
+      logger('info', 'close') { 'done!' }
       @closed = true
       @json ? { 'result' => 'Success' } : true
     end

lib/server.rb

@@ -15,7 +15,7 @@ def initialize(init_opts)
   end
 
   def run_server
-    logger('debug', 'server/run_server') { "on port #{@server_port}" }
+    logger('info', 'server/run_server') { "on port #{@server_port}" }
 
     connection = WinRM::Connection.new(@winrm_connection_options)
 
@@ -42,25 +42,25 @@ def load_instance_variables(init_opts)
   end
 
   def check_script_file
-    logger('debug', 'server/initialize') { 'checking script file on remote' }
+    logger('debug', 'server/check_script_file') { 'checking script file on remote' }
     deploy_script_file
     unless @winrm_fs.exists?(@r_script_file)
-      raise ServerError.new('server/initialize'),
+      raise ServerError.new('server/check_script_file'),
             'toolsHCK.ps1 script was not found on remote.'
     end
-    logger('debug', 'server/initialize') { 'checked' }
+    logger('info', 'server/check_script_file') { 'checked' }
   end
 
   def deploy_script_file
     tools_hck = File.expand_path('../tools/toolsHCK.ps1', __dir__)
-    logger('debug', 'server/initialize') { 'deploying script file on remote' }
+    logger('debug', 'server/deploy_script_file') { 'deploying script file on remote' }
     @winrm_fs.delete(@r_script_file)
     @winrm_fs.upload(tools_hck, @r_script_file)
-    logger('debug', 'server/initialize') { 'deployed' }
+    logger('debug', 'server/deploy_script_file') { 'deployed' }
   end
 
   def load_toolshck_server
-    logger('debug', 'server/initialize') do
+    logger('debug', 'server/load_toolshck_server') do
       "loading server to listen on port #{@server_port}"
     end
     @log_fetcher = Thread.new do
@@ -75,7 +75,7 @@ def load_toolshck_server
         end
       end
     end
-    logger('debug', 'server/initialize') { 'loaded' }
+    logger('info', 'server/load_toolshck_server') { 'loaded' }
   end
 
   def process_script
@@ -94,7 +94,7 @@ def close
     logger('debug', 'server/close') { 'closing server' }
     @log_fetcher&.kill
   ensure
-    logger('debug', 'server/close') { 'closed' }
+    logger('info', 'server/close') { 'closed' }
     @winrm_ps&.close
   end
 end