reverse-tunnel 0.0.1 → 0.0.2

data/lib/reverse-tunnel.rb

@@ -27,7 +27,13 @@ end
 require "eventmachine"
 require "msgpack"
 require "trollop"
-require "syslog/logger"
+
+begin
+  require "syslog/logger"
+rescue LoadError
+  require 'syslog_logger'
+  Syslog::Logger = SyslogLogger
+end
 
 require "reverse-tunnel/message"
 require "reverse-tunnel/server"

data/lib/reverse-tunnel/client.rb

@@ -16,7 +16,7 @@ module ReverseTunnel
       end
 
       def process_http_request
-        ReverseTunnel.logger.debug "Process http request #{@http_request_uri}"
+        ReverseTunnel.logger.debug { "Process http request #{@http_request_uri}" }
 
         response = EM::DelegatedHttpResponse.new(self)
         response.status = 200
@@ -60,7 +60,7 @@ module ReverseTunnel
           local_connections.close_all
           @hearbeat.cancel
         else
-          @hearbeat = EventMachine.add_periodic_timer(5) do
+          @hearbeat = EventMachine.add_periodic_timer(30) do
             ping
           end
         end
@@ -69,7 +69,7 @@ module ReverseTunnel
       end
 
       def start
-        ReverseTunnel.logger.debug "Connect to #{host}:#{port}"
+        ReverseTunnel.logger.debug { "Connect to #{host}:#{port}" }
         EventMachine.connect host, port, TunnelConnection, self
       end
 
@@ -84,7 +84,7 @@ module ReverseTunnel
 
       def ping
         next_number = self.sequence_number += 1
-        ReverseTunnel.logger.debug "Send ping #{next_number}"
+        ReverseTunnel.logger.debug { "Send ping #{next_number}" } 
         connection.send_data Message::Ping.new(next_number).pack if connection
       end
 
@@ -99,7 +99,7 @@ module ReverseTunnel
 
       def send_data(session_id, data)
         if connection
-          ReverseTunnel.logger.debug "Send data to local connection #{session_id}"
+          ReverseTunnel.logger.debug { "Send data to local connection #{session_id}" }
           connection.send_data Message::Data.new(session_id,data).pack
         end
       end
@@ -111,7 +111,7 @@ module ReverseTunnel
       def receive_data(session_id, data)
         local_connection = local_connections.find(session_id)
         if local_connection
-          ReverseTunnel.logger.debug "Send data to local connection #{session_id}"
+          ReverseTunnel.logger.debug { "Send data to local connection #{session_id}" }
           local_connection.send_data data
         else
           local_connections.bufferize session_id, data
@@ -147,7 +147,7 @@ module ReverseTunnel
         connections << connection
 
         session_id = connection.session_id
-        ReverseTunnel.logger.debug "Clear buffer for #{session_id}"
+        ReverseTunnel.logger.debug { "Clear buffer for #{session_id}" }
 
         (buffers.delete(session_id) or []).each do |data|
           connection.send_data data
@@ -160,7 +160,7 @@ module ReverseTunnel
       end
 
       def bufferize(session_id, data)
-        ReverseTunnel.logger.debug "Push buffer for #{session_id}"
+        ReverseTunnel.logger.debug { "Push buffer for #{session_id}" }
         buffers[session_id] << data
       end
 
@@ -188,7 +188,7 @@ module ReverseTunnel
       end
 
       def post_init
-        ReverseTunnel.logger.debug "New tunnel connection"
+        ReverseTunnel.logger.debug { "New tunnel connection" }
         self.created_at = Time.now
 
         tunnel.connection = self
@@ -204,11 +204,11 @@ module ReverseTunnel
       end
 
       def receive_data(data)
-        ReverseTunnel.logger.debug "Received data '#{data.unpack('H*').join}'"
+        ReverseTunnel.logger.debug { "Received data '#{data.unpack('H*').join}'" }
         message_unpacker.feed data
 
         message_unpacker.each do |message|
-          ReverseTunnel.logger.debug "Received message in tunnel #{message.inspect}"
+          ReverseTunnel.logger.debug { "Received message in tunnel #{message.inspect}" }
 
           if message.data?
             tunnel.receive_data message.session_id, message.data
@@ -221,7 +221,7 @@ module ReverseTunnel
       end
 
       def unbind
-        ReverseTunnel.logger.debug "Close tunnel connection"
+        ReverseTunnel.logger.debug { "Close tunnel connection" }
         tunnel.connection = nil
       end
 
@@ -238,24 +238,24 @@ module ReverseTunnel
       end
 
       def post_init
-        ReverseTunnel.logger.debug "New local connection"
+        ReverseTunnel.logger.debug { "New local connection" }
         @created_at = Time.now
         tunnel.local_connections << self
       end
 
       def receive_data(data)
-        ReverseTunnel.logger.debug "Received data in local connection #{session_id}"
+        ReverseTunnel.logger.debug { "Received data in local connection #{session_id}" }
         @received_size += data.size
         tunnel.send_data session_id, data
       end
 
       def unbind
-        ReverseTunnel.logger.debug "Close local connection #{session_id}"
+        ReverseTunnel.logger.debug { "Close local connection #{session_id}" }
         tunnel.local_connections.delete self
       end
 
       def send_data(data)
-        ReverseTunnel.logger.debug "Send data '#{data.unpack('H*').join}'"
+        ReverseTunnel.logger.debug { "Send data '#{data.unpack('H*').join}'" }
         @send_size += data.size
         super
       end

data/lib/reverse-tunnel/server.rb

@@ -31,7 +31,7 @@ module ReverseTunnel
         #   @http_post_content
         #   @http_headers
 
-        ReverseTunnel.logger.debug "Process http request #{@http_request_uri}"
+        ReverseTunnel.logger.debug { "Process http request #{@http_request_uri}" }
 
         response = EM::DelegatedHttpResponse.new(self)
         response.status = 200
@@ -138,19 +138,19 @@ module ReverseTunnel
 
       def open_session(session_id)
         if connection
-          ReverseTunnel.logger.debug "Send open session #{session_id}"
+          ReverseTunnel.logger.debug { "Send open session #{session_id}" }
           connection.send_data Message::OpenSession.new(session_id).pack
         end
       end
 
       def ping_received(ping)
-        ReverseTunnel.logger.debug "Receive ping #{token}/#{ping.sequence_number}"
+        ReverseTunnel.logger.debug { "Receive ping #{token}/#{ping.sequence_number}" }
         connection.send_data Message::Ping.new(ping.sequence_number).pack
       end
 
       def send_data(session_id, data)
         if connection
-          ReverseTunnel.logger.debug "Send data to local connection #{session_id}"
+          ReverseTunnel.logger.debug { "Send data to local connection #{session_id}" }
           connection.send_data Message::Data.new(session_id,data).pack
         end
       end
@@ -162,7 +162,7 @@ module ReverseTunnel
       def receive_data(session_id, data)
         local_connection = local_connections.find { |c| c.session_id == session_id }
         if local_connection
-          ReverseTunnel.logger.debug "Send data for local connection #{session_id}"
+          ReverseTunnel.logger.debug { "Send data for local connection #{session_id}" } 
           local_connection.send_data data 
         end
       end
@@ -269,13 +269,13 @@ module ReverseTunnel
       end
 
       def post_init
-        ReverseTunnel.logger.debug "New local connection"
+        ReverseTunnel.logger.debug { "New local connection" }
         tunnel.local_connections << self
         tunnel.open_session(session_id)
       end
 
       def receive_data(data)
-        ReverseTunnel.logger.debug "Received data in local #{session_id}"
+        ReverseTunnel.logger.debug { "Received data in local #{session_id}" }
         tunnel.send_data session_id, data
       end
 
@@ -284,7 +284,7 @@ module ReverseTunnel
       end
 
       def unbind
-        ReverseTunnel.logger.debug "Close local connection"
+        ReverseTunnel.logger.debug { "Close local connection" }
         tunnel.local_connections.delete self
       end
 
@@ -364,8 +364,6 @@ module ReverseTunnel
     end
 
     def start
-      tunnels.create "token" => "6B833D3F561369156820B4240C7C2657", "local_port" => 10000
-
       EventMachine.run do
         start_server
         start_api

data/lib/reverse-tunnel/version.rb

@@ -1,3 +1,3 @@
 module ReverseTunnel
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: reverse-tunnel
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-27 00:00:00.000000000 Z
+date: 2012-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -252,7 +252,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1765288854633900914
+      hash: 2213340273157857061
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -261,7 +261,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1765288854633900914
+      hash: 2213340273157857061
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23