hrr_rb_ssh 0.3.0.pre1 → 0.4.2

data/lib/hrr_rb_ssh/connection/channel/channel_type/session/request_type/shell.rb

@@ -1,7 +1,6 @@
 # coding: utf-8
 # vim: et ts=2 sw=2
 
-require 'hrr_rb_ssh/logger'
 require 'hrr_rb_ssh/connection/request_handler'
 
 module HrrRbSsh
@@ -13,10 +12,8 @@ module HrrRbSsh
             class Shell < RequestType
               NAME = 'shell'
 
-              def self.run proc_chain, username, io, variables, message, options, session
-                logger = Logger.new self.class.name
-
-                context = Context.new proc_chain, username, io, variables, message, session
+              def self.run proc_chain, username, io, variables, message, options, session, logger: nil
+                context = Context.new proc_chain, username, io, variables, message, session, logger: logger
                 handler = options.fetch('connection_channel_request_shell', RequestHandler.new {})
                 handler.run context
 

data/lib/hrr_rb_ssh/connection/channel/channel_type/session/request_type/shell/context.rb

@@ -1,7 +1,7 @@
 # coding: utf-8
 # vim: et ts=2 sw=2
 
-require 'hrr_rb_ssh/logger'
+require 'hrr_rb_ssh/loggable'
 
 module HrrRbSsh
   class Connection
@@ -11,15 +11,16 @@ module HrrRbSsh
           class RequestType
             class Shell
               class Context
+                include Loggable
+
                 attr_reader \
-                  :logger,
                   :username,
                   :io,
                   :variables,
                   :vars
 
-                def initialize proc_chain, username, io, variables, message, session
-                  @logger = Logger.new self.class.name
+                def initialize proc_chain, username, io, variables, message, session, logger: nil
+                  self.logger = logger
 
                   @proc_chain = proc_chain
                   @username   = username

data/lib/hrr_rb_ssh/connection/channel/channel_type/session/request_type/subsystem.rb

@@ -1,7 +1,6 @@
 # coding: utf-8
 # vim: et ts=2 sw=2
 
-require 'hrr_rb_ssh/logger'
 require 'hrr_rb_ssh/connection/request_handler'
 
 module HrrRbSsh
@@ -13,10 +12,8 @@ module HrrRbSsh
             class Subsystem < RequestType
               NAME = 'subsystem'
 
-              def self.run proc_chain, username, io, variables, message, options, session
-                logger = Logger.new self.class.name
-
-                context = Context.new proc_chain, username, io, variables, message, session
+              def self.run proc_chain, username, io, variables, message, options, session, logger: nil
+                context = Context.new proc_chain, username, io, variables, message, session, logger: logger
                 handler = options.fetch('connection_channel_request_subsystem', RequestHandler.new {})
                 handler.run context
 

data/lib/hrr_rb_ssh/connection/channel/channel_type/session/request_type/subsystem/context.rb

@@ -1,7 +1,7 @@
 # coding: utf-8
 # vim: et ts=2 sw=2
 
-require 'hrr_rb_ssh/logger'
+require 'hrr_rb_ssh/loggable'
 
 module HrrRbSsh
   class Connection
@@ -11,16 +11,17 @@ module HrrRbSsh
           class RequestType
             class Subsystem
               class Context
+                include Loggable
+
                 attr_reader \
-                  :logger,
                   :username,
                   :io,
                   :variables,
                   :vars,
                   :subsystem_name
 
-                def initialize proc_chain, username, io, variables, message, session
-                  @logger = Logger.new self.class.name
+                def initialize proc_chain, username, io, variables, message, session, logger: nil
+                  self.logger = logger
 
                   @proc_chain = proc_chain
                   @username   = username

data/lib/hrr_rb_ssh/connection/channel/channel_type/session/request_type/window_change.rb

@@ -1,7 +1,6 @@
 # coding: utf-8
 # vim: et ts=2 sw=2
 
-require 'hrr_rb_ssh/logger'
 require 'hrr_rb_ssh/connection/request_handler'
 
 module HrrRbSsh
@@ -13,10 +12,8 @@ module HrrRbSsh
             class WindowChange < RequestType
               NAME = 'window-change'
 
-              def self.run proc_chain, username, io, variables, message, options, session
-                logger = Logger.new self.class.name
-
-                context = Context.new proc_chain, username, io, variables, message, session
+              def self.run proc_chain, username, io, variables, message, options, session, logger: nil
+                context = Context.new proc_chain, username, io, variables, message, session, logger: logger
                 handler = options.fetch('connection_channel_request_window_change', RequestHandler.new {})
                 handler.run context
 

data/lib/hrr_rb_ssh/connection/channel/channel_type/session/request_type/window_change/context.rb

@@ -1,7 +1,7 @@
 # coding: utf-8
 # vim: et ts=2 sw=2
 
-require 'hrr_rb_ssh/logger'
+require 'hrr_rb_ssh/loggable'
 
 module HrrRbSsh
   class Connection
@@ -11,8 +11,9 @@ module HrrRbSsh
           class RequestType
             class WindowChange
               class Context
+                include Loggable
+
                 attr_reader \
-                  :logger,
                   :username,
                   :io,
                   :variables,
@@ -22,8 +23,8 @@ module HrrRbSsh
                   :terminal_width_pixels,
                   :terminal_height_pixels
 
-                def initialize proc_chain, username, io, variables, message, session
-                  @logger = Logger.new self.class.name
+                def initialize proc_chain, username, io, variables, message, session, logger: nil
+                  self.logger = logger
 
                   @proc_chain = proc_chain
                   @username   = username

data/lib/hrr_rb_ssh/connection/global_request_handler.rb

@@ -2,23 +2,25 @@
 # vim: et ts=2 sw=2
 
 require 'socket'
-require 'hrr_rb_ssh/logger'
+require 'hrr_rb_ssh/loggable'
 
 module HrrRbSsh
   class Connection
     class GlobalRequestHandler
+      include Loggable
+
       attr_reader \
         :accepted
 
-      def initialize connection
-        @logger = Logger.new self.class.name
+      def initialize connection, logger: nil
+        self.logger = logger
         @connection = connection
         @tcpip_forward_servers = Hash.new
         @tcpip_forward_threads = Hash.new
       end
 
       def close
-        @logger.info { "closing tcpip-forward" }
+        log_info { "closing tcpip-forward" }
         @tcpip_forward_threads.values.each(&:exit)
         @tcpip_forward_servers.values.each{ |s|
           begin
@@ -29,7 +31,7 @@ module HrrRbSsh
         }
         @tcpip_forward_threads.clear
         @tcpip_forward_servers.clear
-        @logger.info { "tcpip-forward closed" }
+        log_info { "tcpip-forward closed" }
       end
 
       def request message
@@ -39,13 +41,13 @@ module HrrRbSsh
         when "cancel-tcpip-forward"
           cancel_tcpip_forward message
         else
-          @logger.warn { "unsupported request name: #{message[:'request name']}" }
+          log_warn { "unsupported request name: #{message[:'request name']}" }
           raise
         end
       end
 
       def tcpip_forward message
-        @logger.info { "starting tcpip-forward" }
+        log_info { "starting tcpip-forward" }
         begin
           address_to_bind     = message[:'address to bind']
           port_number_to_bind = message[:'port number to bind']
@@ -60,18 +62,18 @@ module HrrRbSsh
                 }
               end
             rescue => e
-              @logger.error { [e.backtrace[0], ": ", e.message, " (", e.class.to_s, ")\n\t", e.backtrace[1..-1].join("\n\t")].join }
+              log_error { [e.backtrace[0], ": ", e.message, " (", e.class.to_s, ")\n\t", e.backtrace[1..-1].join("\n\t")].join }
             end
           }
-          @logger.info { "tcpip-forward started" }
+          log_info { "tcpip-forward started" }
         rescue => e
-          @logger.warn { "starting tcpip-forward failed: #{e.message}" }
+          log_warn { "starting tcpip-forward failed: #{e.message}" }
           raise e
         end
       end
 
       def cancel_tcpip_forward message
-        @logger.info { "canceling tcpip-forward" }
+        log_info { "canceling tcpip-forward" }
         address_to_bind     = message[:'address to bind']
         port_number_to_bind = message[:'port number to bind']
         id = "#{address_to_bind}:#{port_number_to_bind}"
@@ -83,7 +85,7 @@ module HrrRbSsh
         end
         @tcpip_forward_threads.delete id
         @tcpip_forward_servers.delete id
-        @logger.info { "tcpip-forward canceled" }
+        log_info { "tcpip-forward canceled" }
       end
     end
   end

data/lib/hrr_rb_ssh/connection/request_handler.rb

@@ -1,15 +1,13 @@
 # coding: utf-8
 # vim: et ts=2 sw=2
 
-require 'hrr_rb_ssh/logger'
-
 module HrrRbSsh
   class Connection
     class RequestHandler
       def initialize &block
-        @logger = Logger.new self.class.name
         @proc = block
       end
+
       def run context
         @proc.call context
       end

data/lib/hrr_rb_ssh/connection/request_handler/reference_env_request_handler.rb

@@ -1,7 +1,6 @@
 # coding: utf-8
 # vim: et ts=2 sw=2
 
-require 'hrr_rb_ssh/logger'
 require 'hrr_rb_ssh/connection/request_handler'
 
 module HrrRbSsh
@@ -9,7 +8,6 @@ module HrrRbSsh
     class RequestHandler
       class ReferenceEnvRequestHandler < RequestHandler
         def initialize
-          @logger = Logger.new self.class.name
           @proc = Proc.new { |context|
             context.vars[:env] ||= Hash.new
             context.vars[:env][context.variable_name] = context.variable_value

data/lib/hrr_rb_ssh/connection/request_handler/reference_exec_request_handler.rb

@@ -2,7 +2,6 @@
 # vim: et ts=2 sw=2
 
 require 'etc'
-require 'hrr_rb_ssh/logger'
 require 'hrr_rb_ssh/connection/request_handler'
 
 module HrrRbSsh
@@ -10,7 +9,6 @@ module HrrRbSsh
     class RequestHandler
       class ReferenceExecRequestHandler < RequestHandler
         def initialize
-          @logger = Logger.new self.class.name
           @proc = Proc.new { |context|
             ptm = context.vars[:ptm]
             pts = context.vars[:pts]
@@ -58,22 +56,22 @@ module HrrRbSsh
 
                 begin
                   pid, status = Process.waitpid2 pid
-                  context.logger.info { "program exited with status #{status.inspect}" }
+                  context.log_info { "program exited with status #{status.inspect}" }
                   status.exitstatus
                 ensure
                   unless status
-                    context.logger.info { "exiting program" }
+                    context.log_info { "exiting program" }
                     Process.kill :TERM, pid
                     begin
                       Timeout.timeout(1) do
                         pid, status = Process.waitpid2 pid
                       end
                     rescue Timeout::Error
-                      context.logger.warn { "force exiting program" }
+                      context.log_warn { "force exiting program" }
                       Process.kill :KILL, pid
                       pid, status = Process.waitpid2 pid
                     end
-                    context.logger.info { "program exited with status #{status.inspect}" }
+                    context.log_info { "program exited with status #{status.inspect}" }
                   end
                 end
               end

data/lib/hrr_rb_ssh/connection/request_handler/reference_pty_req_request_handler.rb

@@ -5,7 +5,6 @@ require 'etc'
 require 'fileutils'
 require 'pty'
 require 'io/console'
-require 'hrr_rb_ssh/logger'
 require 'hrr_rb_ssh/connection/request_handler'
 
 module HrrRbSsh
@@ -13,7 +12,6 @@ module HrrRbSsh
     class RequestHandler
       class ReferencePtyReqRequestHandler < RequestHandler
         def initialize
-          @logger = Logger.new self.class.name
           @proc = Proc.new { |context|
             begin
               ptm, pts = PTY.open
@@ -32,16 +30,16 @@ module HrrRbSsh
                       begin
                         context.io[1].write ptm.readpartial(10240)
                       rescue EOFError => e
-                        context.logger.info { "ptm is EOF in ptm_read_thread" }
+                        context.log_info { "ptm is EOF in ptm_read_thread" }
                         break
                       rescue IOError => e
-                        context.logger.warn { "IO Error in ptm_read_thread" }
+                        context.log_warn { "IO Error in ptm_read_thread" }
                         break
                       rescue Errno::EIO => e
-                        context.logger.info { "EIO Error in ptm_read_thread" }
+                        context.log_info { "EIO Error in ptm_read_thread" }
                         break
                       rescue => e
-                        context.logger.error { [e.backtrace[0], ": ", e.message, " (", e.class.to_s, ")\n\t", e.backtrace[1..-1].join("\n\t")].join }
+                        context.log_error { [e.backtrace[0], ": ", e.message, " (", e.class.to_s, ")\n\t", e.backtrace[1..-1].join("\n\t")].join }
                         break
                       end
                     end
@@ -51,29 +49,29 @@ module HrrRbSsh
                       begin
                         ptm.write context.io[0].readpartial(10240)
                       rescue EOFError => e
-                        context.logger.info { "IO is EOF in ptm_write_thread" }
+                        context.log_info { "IO is EOF in ptm_write_thread" }
                         break
                       rescue IOError => e
-                        context.logger.warn { "IO Error in ptm_write_thread" }
+                        context.log_warn { "IO Error in ptm_write_thread" }
                         break
                       rescue Errno::EIO => e
-                        context.logger.info { "EIO Error in ptm_read_thread" }
+                        context.log_info { "EIO Error in ptm_read_thread" }
                         break
                       rescue => e
-                        context.logger.error { [e.backtrace[0], ": ", e.message, " (", e.class.to_s, ")\n\t", e.backtrace[1..-1].join("\n\t")].join }
+                        context.log_error { [e.backtrace[0], ": ", e.message, " (", e.class.to_s, ")\n\t", e.backtrace[1..-1].join("\n\t")].join }
                         break
                       end
                     end
                   }
                   chain.call_next
                 ensure
-                  context.logger.info { "closing pty-req request handler chain_proc" }
+                  context.log_info { "closing pty-req request handler chain_proc" }
                   context.vars[:ptm].close rescue nil
                   context.vars[:pts].close rescue nil
                   ptm_read_thread.join
                   ptm_write_thread.exit
                   ptm_write_thread.join
-                  context.logger.info { "pty-req request handler chain_proc closed" }
+                  context.log_info { "pty-req request handler chain_proc closed" }
                 end
               }
             rescue => e

data/lib/hrr_rb_ssh/connection/request_handler/reference_shell_request_handler.rb

@@ -3,7 +3,6 @@
 
 require 'etc'
 require 'timeout'
-require 'hrr_rb_ssh/logger'
 require 'hrr_rb_ssh/connection/request_handler'
 
 module HrrRbSsh
@@ -11,7 +10,6 @@ module HrrRbSsh
     class RequestHandler
       class ReferenceShellRequestHandler < RequestHandler
         def initialize
-          @logger = Logger.new self.class.name
           @proc = Proc.new { |context|
             ptm = context.vars[:ptm]
             pts = context.vars[:pts]
@@ -49,22 +47,22 @@ module HrrRbSsh
 
               begin
                 pid, status = Process.waitpid2 pid
-                context.logger.info { "shell exited with status #{status.inspect}" }
+                context.log_info { "shell exited with status #{status.inspect}" }
                 status.exitstatus
               ensure
                 unless status
-                  context.logger.info { "exiting shell" }
+                  context.log_info { "exiting shell" }
                   Process.kill :TERM, pid
                   begin
                     Timeout.timeout(1) do
                       pid, status = Process.waitpid2 pid
                     end
                   rescue Timeout::Error
-                    context.logger.warn { "force exiting shell" }
+                    context.log_warn { "force exiting shell" }
                     Process.kill :KILL, pid
                     pid, status = Process.waitpid2 pid
                   end
-                  context.logger.info { "shell exited with status #{status.inspect}" }
+                  context.log_info { "shell exited with status #{status.inspect}" }
                 end
               end
             }

data/lib/hrr_rb_ssh/connection/request_handler/reference_window_change_request_handler.rb

@@ -2,7 +2,6 @@
 # vim: et ts=2 sw=2
 
 require 'io/console'
-require 'hrr_rb_ssh/logger'
 require 'hrr_rb_ssh/connection/request_handler'
 
 module HrrRbSsh
@@ -10,7 +9,6 @@ module HrrRbSsh
     class RequestHandler
       class ReferenceWindowChangeRequestHandler < RequestHandler
         def initialize
-          @logger = Logger.new self.class.name
           @proc = Proc.new { |context|
             context.vars[:ptm].winsize = [context.terminal_height_rows, context.terminal_width_columns, context.terminal_width_pixels, context.terminal_height_pixels]
           }