hrr_rb_ssh 0.3.0.pre1 → 0.4.2

data/lib/hrr_rb_ssh/connection/channel/channel_type/direct_tcpip.rb

@@ -1,17 +1,19 @@
 # coding: utf-8
 # vim: et ts=2 sw=2
 
-require 'hrr_rb_ssh/logger'
+require 'hrr_rb_ssh/loggable'
 
 module HrrRbSsh
   class Connection
     class Channel
       class ChannelType
         class DirectTcpip < ChannelType
+          include Loggable
+
           NAME = 'direct-tcpip'
 
-          def initialize connection, channel, message, socket=nil
-            @logger = Logger.new self.class.name
+          def initialize connection, channel, message, socket=nil, logger: nil
+            self.logger = logger
             @connection = connection
             @channel = channel
             @host_to_connect       = message[:'host to connect']
@@ -29,13 +31,16 @@ module HrrRbSsh
           def close
             begin
               if @sender_thread_finished && @receiver_thread_finished
-                @logger.info { "closing direct-tcpip" }
+                log_info { "closing direct-tcpip" }
                 @socket.close
+                log_info { "closing channel IOs" }
+                @channel.io.each{ |io| io.close rescue nil }
+                log_info { "channel IOs closed" }
                 @channel.close from=:channel_type_instance
-                @logger.info { "direct-tcpip closed" }
+                log_info { "direct-tcpip closed" }
               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
           end
 
@@ -46,24 +51,24 @@ module HrrRbSsh
                   begin
                     @channel.io[1].write s.readpartial(10240)
                   rescue EOFError
-                    @logger.info { "socket is EOF" }
-                    @channel.io[1].close
+                    log_info { "socket is EOF" }
+                    @channel.io[1].close rescue nil
                     break
                   rescue IOError
-                    @logger.info { "socket is closed" }
-                    @channel.io[1].close
+                    log_info { "socket is closed" }
+                    @channel.io[1].close rescue nil
                     break
                   rescue => e
-                    @logger.error { [e.backtrace[0], ": ", e.message, " (", e.class.to_s, ")\n\t", e.backtrace[1..-1].join("\n\t")].join }
-                    @channel.io[1].close
+                    log_error { [e.backtrace[0], ": ", e.message, " (", e.class.to_s, ")\n\t", e.backtrace[1..-1].join("\n\t")].join }
+                    @channel.io[1].close rescue nil
                     break
                   end
                 end
-                @logger.info { "finishing sender thread" }
+                log_info { "finishing sender thread" }
                 @sender_thread_finished = true
                 close
               ensure
-                @logger.info { "sender thread finished" }
+                log_info { "sender thread finished" }
               end
             }
           end
@@ -75,23 +80,23 @@ module HrrRbSsh
                   begin
                     s.write @channel.io[0].readpartial(10240)
                   rescue EOFError
-                    @logger.info { "io is EOF" }
+                    log_info { "io is EOF" }
                     s.close_write
                     break
                   rescue IOError
-                    @logger.info { "socket is closed" }
+                    log_info { "socket is closed" }
                     break
                   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 }
                     s.close_write
                     break
                   end
                 end
-                @logger.info { "finishing receiver thread" }
+                log_info { "finishing receiver thread" }
                 @receiver_thread_finished = true
                 close
               ensure
-                @logger.info { "receiver thread finished" }
+                log_info { "receiver thread finished" }
               end
             }
           end

data/lib/hrr_rb_ssh/connection/channel/channel_type/forwarded_tcpip.rb

@@ -1,17 +1,19 @@
 # coding: utf-8
 # vim: et ts=2 sw=2
 
-require 'hrr_rb_ssh/logger'
+require 'hrr_rb_ssh/loggable'
 
 module HrrRbSsh
   class Connection
     class Channel
       class ChannelType
         class ForwardedTcpip < ChannelType
+          include Loggable
+
           NAME = 'forwarded-tcpip'
 
-          def initialize connection, channel, message, socket
-            @logger = Logger.new self.class.name
+          def initialize connection, channel, message, socket, logger: nil
+            self.logger = logger
             @connection = connection
             @channel = channel
             @socket = socket
@@ -25,13 +27,16 @@ module HrrRbSsh
           def close
             begin
               if @sender_thread_finished && @receiver_thread_finished
-                @logger.info { "closing forwarded-tcpip" }
+                log_info { "closing forwarded-tcpip" }
                 @socket.close
+                log_info { "closing channel IOs" }
+                @channel.io.each{ |io| io.close rescue nil }
+                log_info { "channel IOs closed" }
                 @channel.close from=:channel_type_instance
-                @logger.info { "forwarded-tcpip closed" }
+                log_info { "forwarded-tcpip closed" }
               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
           end
 
@@ -42,24 +47,24 @@ module HrrRbSsh
                   begin
                     @channel.io[1].write s.readpartial(10240)
                   rescue EOFError
-                    @logger.info { "socket is EOF" }
-                    @channel.io[1].close
+                    log_info { "socket is EOF" }
+                    @channel.io[1].close rescue nil
                     break
                   rescue IOError
-                    @logger.info { "socket is closed" }
-                    @channel.io[1].close
+                    log_info { "socket is closed" }
+                    @channel.io[1].close rescue nil
                     break
                   rescue => e
-                    @logger.error { [e.backtrace[0], ": ", e.message, " (", e.class.to_s, ")\n\t", e.backtrace[1..-1].join("\n\t")].join }
-                    @channel.io[1].close
+                    log_error { [e.backtrace[0], ": ", e.message, " (", e.class.to_s, ")\n\t", e.backtrace[1..-1].join("\n\t")].join }
+                    @channel.io[1].close rescue nil
                     break
                   end
                 end
-                @logger.info { "finishing sender thread" }
+                log_info { "finishing sender thread" }
                 @sender_thread_finished = true
                 close
               ensure
-                @logger.info { "sender thread finished" }
+                log_info { "sender thread finished" }
               end
             }
           end
@@ -71,23 +76,23 @@ module HrrRbSsh
                   begin
                     s.write @channel.io[0].readpartial(10240)
                   rescue EOFError
-                    @logger.info { "io is EOF" }
+                    log_info { "io is EOF" }
                     s.close_write
                     break
                   rescue IOError
-                    @logger.info { "socket is closed" }
+                    log_info { "socket is closed" }
                     break
                   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 }
                     s.close_write
                     break
                   end
                 end
-                @logger.info { "finishing receiver thread" }
+                log_info { "finishing receiver thread" }
                 @receiver_thread_finished = true
                 close
               ensure
-                @logger.info { "receiver thread finished" }
+                log_info { "receiver thread finished" }
               end
             }
           end

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

@@ -1,25 +1,29 @@
 # coding: utf-8
 # vim: et ts=2 sw=2
 
-require 'hrr_rb_ssh/logger'
+require 'hrr_rb_ssh/loggable'
 
 module HrrRbSsh
   class Connection
     class Channel
       class ChannelType
         class Session < ChannelType
+          include Loggable
+
           NAME = 'session'
 
-          def initialize connection, channel, message, socket=nil
-            @logger = Logger.new self.class.name
+          def initialize connection, channel, message, socket=nil, logger: nil
+            self.logger = logger
             @connection = connection
             @channel = channel
-            @variables = {}
             @proc_chain = ProcChain.new
           end
 
           def start
-            @proc_chain_thread = proc_chain_thread
+            case @connection.mode
+            when Mode::SERVER
+              @proc_chain_thread = proc_chain_thread
+            end
           end
 
           def close
@@ -30,24 +34,27 @@ module HrrRbSsh
 
           def request message
             request_type = message[:'request type']
-            RequestType[request_type].run @proc_chain, @connection.username, @channel.io, @variables, message, @connection.options, self
+            RequestType[request_type].run @proc_chain, @connection.username, @channel.io, @connection.variables, message, @connection.options, self, logger: logger
           end
 
           def proc_chain_thread
             Thread.start {
-              @logger.info { "start proc chain thread" }
+              log_info { "start proc chain thread" }
               begin
                 exitstatus = @proc_chain.call_next
               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 }
                 exitstatus = 1
               ensure
-                @logger.info { "closing proc chain thread" }
-                @logger.info { "wait for sending output" }
+                log_info { "closing proc chain thread" }
+                log_info { "closing channel IOs" }
+                @channel.io.each{ |io| io.close rescue nil }
+                log_info { "channel IOs closed" }
+                log_info { "wait for sending output" }
                 @channel.wait_until_senders_closed
-                @logger.info { "sending output finished" }
+                log_info { "sending output finished" }
                 @channel.close from=:channel_type_instance, exitstatus=exitstatus
-                @logger.info { "proc chain thread closed" }
+                log_info { "proc chain thread closed" }
               end
             }
           end

data/lib/hrr_rb_ssh/connection/channel/channel_type/session/proc_chain.rb

@@ -1,7 +1,6 @@
 # coding: utf-8
 # vim: et ts=2 sw=2
 
-require 'hrr_rb_ssh/logger'
 require 'hrr_rb_ssh/connection/channel/channel_type/session/proc_chain/chain_context'
 
 module HrrRbSsh
@@ -11,7 +10,6 @@ module HrrRbSsh
         class Session
           class ProcChain
             def initialize
-              @logger = Logger.new self.class.name
               @q = Queue.new
             end
             def connect next_proc

data/lib/hrr_rb_ssh/connection/channel/channel_type/session/proc_chain/chain_context.rb

@@ -1,8 +1,6 @@
 # coding: utf-8
 # vim: et ts=2 sw=2
 
-require 'hrr_rb_ssh/logger'
-
 module HrrRbSsh
   class Connection
     class Channel
@@ -11,7 +9,6 @@ module HrrRbSsh
           class ProcChain
             class ChainContext
               def initialize proc_chain
-                @logger = Logger.new self.class.name
                 @proc_chain = proc_chain
               end
               def call_next *args

data/lib/hrr_rb_ssh/connection/channel/channel_type/session/request_type/env.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 Env < RequestType
               NAME = 'env'
 
-              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_env', RequestHandler.new {})
                 handler.run context
 

data/lib/hrr_rb_ssh/connection/channel/channel_type/session/request_type/env/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 Env
               class Context
+                include Loggable
+
                 attr_reader \
-                  :logger,
                   :username,
                   :io,
                   :variables,
@@ -20,8 +21,8 @@ module HrrRbSsh
                   :variable_name,
                   :variable_value
 
-                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/exec.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 Exec < RequestType
               NAME = 'exec'
 
-              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_exec', RequestHandler.new {})
                 handler.run context
 

data/lib/hrr_rb_ssh/connection/channel/channel_type/session/request_type/exec/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 Exec
               class Context
+                include Loggable
+
                 attr_reader \
-                  :logger,
                   :username,
                   :io,
                   :variables,
                   :vars,
                   :command
 
-                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/pty_req.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 PtyReq < RequestType
               NAME = 'pty-req'
 
-              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_pty_req', RequestHandler.new {})
                 handler.run context
 

data/lib/hrr_rb_ssh/connection/channel/channel_type/session/request_type/pty_req/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 PtyReq
               class Context
+                include Loggable
+
                 attr_reader \
-                  :logger,
                   :username,
                   :io,
                   :variables,
@@ -24,8 +25,8 @@ module HrrRbSsh
                   :terminal_height_pixels,
                   :encoded_terminal_modes
 
-                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