lib/envoy/server/trunk.rb in envoy-proxy-0.2.3 vs lib/envoy/server/trunk.rb in envoy-proxy-1.0.0

@@ -1,6 +1,7 @@
 require 'envoy/protocol'
+require 'envoy/utils'
 
 module Envoy
   module Server
     module Trunk
       include Protocol
@@ -24,41 +25,16 @@
       
       def channels
         @channels ||= {}
       end
       
-      def receive_pong
-        EM.add_timer 30 do
-          send_object :ping
-        end
-      end
-      
-      def receive_close id, code = nil
-        if chan = channels[id]
-          chan.web.close(code)
-          channels.delete id
-        end
-      end
-      
-      def receive_start_tls
-        send_object :start_tls
-        start_tls
-      end
-      
-      def receive_stream id, data
-        c = channels[id]
-        w = c && c.web
-        w && w.send_data(data)
-      end
-      
       def key
         @options[:key]
       end
       
-      def log message
-        t = Time.now.strftime("%F %T")
-        STDERR.puts t + " " + message.split("\n").join("\n#{t.gsub(/./, ' ')} ")
+      def log (*args)
+        Envoy.log(*args)
       end
       
       def message (level, message)
         if @options[:verbosity]
           send_object :message, message, level
@@ -66,57 +42,86 @@
           send_object :message, message
         end
       end
       
       def halt message = nil
-        message FATAL, message if message
+        message Envoy::FATAL, message if message
         send_object :halt
         close_connection(true)
       end
       
       def version? *requirement
         Gem::Requirement.new(*requirement) =~ Gem::Version.new(@options[:version])
       end
       
+      def receive_pong
+        unless @pinged
+          send_object :ping
+          @pinged = true
+        else
+          EM.add_timer 30 do
+            send_object :ping
+          end
+        end
+      end
+      
+      def receive_close id, code = nil
+        if chan = channels[id]
+          chan.web.close(code)
+          channels.delete id
+        end
+      end
+      
+      def receive_start_tls
+        send_object :start_tls
+        start_tls
+      end
+      
+      def receive_stream id, data
+        c = channels[id]
+        w = c && c.web
+        w && w.send_data(data)
+      end
+      
       def receive_options options
         @options = options
         receive_pong if version? "> 0.1"
         if version? "< #{Envoy::VERSION}"
-          message WARN, "Your client is out of date. Please upgrade to #{Envoy::VERSION}."
+          message Envoy::WARN, "Your client is out of date. Please upgrade to #{Envoy::VERSION}."
         elsif version? "> #{Envoy::VERSION}"
-          message WARN, "Your client is from the future. The server is expecting #{Envoy::VERSION}."
+          message Envoy::WARN, "Your client is from the future. The server is expecting #{Envoy::VERSION}."
         end
         if @key and @key != @options[:key]
           halt "Key is invalid"
           return
         end
         hosts = @options[:hosts] || []
         hosts.any? do |label|
           if label == "s"
-            message FATAL, "label is reserved: `#{label}'"
+            message Envoy::FATAL, "label is reserved: `#{label}'"
             true
           elsif label =~ /\./
-            message FATAL, "label is invalid: `#{label}'"
+            message Envoy::FATAL, "label is invalid: `#{label}'"
             true
           elsif other_trunk = Trunk.trunks[label][0]
             unless other_trunk.key == key
-              message FATAL, "label is protected with a key: `#{label}'"
+              message Envoy::FATAL, "label is protected with a key: `#{label}'"
               true
             end
           end
         end && halt
         if hosts.empty?
           hosts = [SecureRandom.random_number(36 ** 4).to_s(36)]
-          message INFO, "Service accessible at http://#{hosts[0]}.#{$zone}/"
+          message Envoy::INFO, "Service accessible at http://#{hosts[0]}.#{$zone}/"
         else
           @hosts = hosts.each do |host|
             Trunk.trunks[host] << self
-            message INFO, "Service accessible at http://#{host}.#{$zone}/"
+            message Envoy::INFO, "Service accessible at http://#{host}.#{$zone}/"
           end
         end
         unless @options[:key]
           @options[:key] = SecureRandom.hex(8)
-          message INFO, "Service access key is `#{@options[:key]}'"
+          message Envoy::INFO, "Service access key is `#{@options[:key]}'"
         end
         send_object :confirm, @options if version? ">= 0.2.2"
       end
       
       def unbind