fix thread rssh param, indentation, rescue close errors

git-svn-id: file:///home/svn/framework3/trunk@10581 4d416f70-5f16-0410-b530-b9f4589650da

lib/net/ssh/command_stream.rb

@@ -25,11 +25,10 @@ class CommandStream
 		self.thread = Thread.new(ssh,cmd,cleanup) do |rssh,rcmd,rcleanup|
 
 			begin
-
+				info = rssh.transport.socket.getpeername
-			info = ssh.transport.socket.getpeername
 				self.lsock.peerinfo  = "#{info[1]}:#{info[2]}"
 
-			info = ssh.transport.socket.getsockname
+				info = rssh.transport.socket.getsockname
 				self.lsock.localinfo = "#{info[1]}:#{info[2]}"
 
 				rssh.open_channel do |rch|
@@ -39,12 +38,14 @@ class CommandStream
 						c[:data] = ''
 
 						c.on_eof do
-						self.rsock.close
+							self.rsock.close rescue nil
+							self.ssh.close rescue nil
 							self.thread.kill
 						end
 
 						c.on_close do
-						self.rsock.close
+							self.rsock.close rescue nil
+							self.ssh.close rescue nil
 							self.thread.kill
 						end
 
@@ -57,7 +58,6 @@ class CommandStream
 						end
 
 						self.channel = c
-
 					end
 				end
 
@@ -77,6 +77,8 @@ class CommandStream
 
 			rescue ::Exception => e
 				self.error = e
+				#::Kernel.warn "BOO: #{e.inspect}"
+				#::Kernel.warn e.backtrace.join("\n")
 			ensure
 				self.monitor.kill if self.monitor
 			end