pubnub 3.5.1 → 3.5.3

data/fixtures/vcr_cassettes/v3-presence-ssl-parameter-valid-non-200-async.yml

@@ -0,0 +1,86 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: https://pubsub.pubnub.com/subscribe/demo-36/demo-pnpres/0/0?auth=demoish_authkey&pnsdk=PubNub-Ruby/3.5.2&uuid=rubytests
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - '*/*'
+      User-Agent:
+      - Ruby
+      Connection:
+      - keep-alive
+      Keep-Alive:
+      - 30
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Date:
+      - Mon, 07 Apr 2014 17:25:47 GMT
+      Content-Type:
+      - text/javascript; charset="UTF-8"
+      Content-Length:
+      - '24'
+      Connection:
+      - keep-alive
+      Cache-Control:
+      - no-cache
+      Access-Control-Allow-Origin:
+      - '*'
+      Access-Control-Allow-Methods:
+      - GET
+    body:
+      encoding: UTF-8
+      string: '[[],"13968915474479311"]'
+    http_version: 
+  recorded_at: Mon, 07 Apr 2014 17:25:48 GMT
+- request:
+    method: get
+    uri: https://pubsub.pubnub.com/subscribe/demo-36/demo-pnpres/0/13968915474479311?auth=demoish_authkey&pnsdk=PubNub-Ruby/3.5.2&uuid=rubytests
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - '*/*'
+      User-Agent:
+      - Ruby
+      Connection:
+      - keep-alive
+      Keep-Alive:
+      - 30
+  response:
+    status:
+      code: 500
+      message: OK
+    headers:
+      Date:
+      - Mon, 07 Apr 2014 17:25:54 GMT
+      Content-Type:
+      - text/javascript; charset="UTF-8"
+      Content-Length:
+      - '131'
+      Connection:
+      - keep-alive
+      Cache-Control:
+      - no-cache
+      Access-Control-Allow-Origin:
+      - '*'
+      Access-Control-Allow-Methods:
+      - GET
+    body:
+      encoding: UTF-8
+      string: '[[{"action": "join", "timestamp": 1396891554, "uuid": "a1259d2d-7a7c-485f-8076-028a327e976d",
+        "occupancy": 1}],"13968915543625014"]'
+    http_version: 
+  recorded_at: Mon, 07 Apr 2014 17:25:55 GMT
+recorded_with: VCR 2.8.0

data/fixtures/vcr_cassettes/v3-presence-ssl-parameter-valid-non-200-sync.yml

@@ -0,0 +1,86 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: https://pubsub.pubnub.com/subscribe/demo-36/demo-pnpres/0/0?auth=demoish_authkey&pnsdk=PubNub-Ruby/3.5.2&uuid=rubytests
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - '*/*'
+      User-Agent:
+      - Ruby
+      Connection:
+      - keep-alive
+      Keep-Alive:
+      - 30
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Date:
+      - Mon, 07 Apr 2014 17:25:47 GMT
+      Content-Type:
+      - text/javascript; charset="UTF-8"
+      Content-Length:
+      - '24'
+      Connection:
+      - keep-alive
+      Cache-Control:
+      - no-cache
+      Access-Control-Allow-Origin:
+      - '*'
+      Access-Control-Allow-Methods:
+      - GET
+    body:
+      encoding: UTF-8
+      string: '[[],"13968915474479311"]'
+    http_version: 
+  recorded_at: Mon, 07 Apr 2014 17:25:48 GMT
+- request:
+    method: get
+    uri: https://pubsub.pubnub.com/subscribe/demo-36/demo-pnpres/0/13968915474479311?auth=demoish_authkey&pnsdk=PubNub-Ruby/3.5.2&uuid=rubytests
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - '*/*'
+      User-Agent:
+      - Ruby
+      Connection:
+      - keep-alive
+      Keep-Alive:
+      - 30
+  response:
+    status:
+      code: 500
+      message: OK
+    headers:
+      Date:
+      - Mon, 07 Apr 2014 17:25:54 GMT
+      Content-Type:
+      - text/javascript; charset="UTF-8"
+      Content-Length:
+      - '131'
+      Connection:
+      - keep-alive
+      Cache-Control:
+      - no-cache
+      Access-Control-Allow-Origin:
+      - '*'
+      Access-Control-Allow-Methods:
+      - GET
+    body:
+      encoding: UTF-8
+      string: '[[{"action": "join", "timestamp": 1396891554, "uuid": "a1259d2d-7a7c-485f-8076-028a327e976d",
+        "occupancy": 1}],"13968915543625014"]'
+    http_version: 
+  recorded_at: Mon, 07 Apr 2014 17:25:55 GMT
+recorded_with: VCR 2.8.0

data/lib/pubnub/client.rb

@@ -16,7 +16,7 @@ module Pubnub
     attr_reader :env
     attr_accessor :single_event_connections_pool, :subscribe_event_connections_pool, :uuid, :async_events
 
-    EVENTS = %w(publish subscribe presence leave history here_now audit grant revoke time)
+    EVENTS = %w(publish subscribe presence leave history here_now audit grant revoke time heartbeat)
     VERSION = Pubnub::VERSION
 
     EVENTS.each do |event_name|
@@ -27,18 +27,8 @@ module Pubnub
       define_method event_name do |params, &block|
         params[:callback] = block if params[:callback].nil?
         event = Pubnub.const_get(classify_method(event_name)).new(params, self)
-        $logger.debug('Created event ' + event.class.to_s)
-        #if params[:http_sync]
-          event.fire(self)
-        #else
-        #  EM.defer {
-        #    begin
-        #      event.fire(self)
-        #    rescue => e
-        #      puts e
-        #    end
-        #  }
-        #end
+        $logger.debug('Pubnub'){'Created event ' + event.class.to_s}
+        event.fire(self)
       end
     end
     alias_method :unsubscribe, :leave
@@ -70,15 +60,38 @@ module Pubnub
 
       EM.stop if stop_em
 
-      $logger.info('Bye!')
+      $logger.info('Pubnub'){'Bye!'}
+    end
+
+    def start_respirator
+      $logger.debug('Pubnub'){'Pubnub::Client#start_respirator | fired'}
+      if @env[:heartbeat]
+        $logger.debug('Pubnub'){'Pubnub::Client#start_respirator | starting'}
+
+        if @env[:heartbeat] != @env[:respirator].interval
+          $logger.debug('Pubnub'){'Pubnub::Client#start_respirator | destroy old respirator'}
+          @env[:respirator].cancel
+          @env[:respirator] = nil
+        end if @env[:respirator]
+
+        @env[:respirator] = EM.add_periodic_timer((@env[:heartbeat].to_i/2) - 1) do
+          @env[:subscriptions].each do |origin, subscribe|
+            $logger.debug('Pubnub'){'Pubnub::Client#start_respirator | BUM'}
+            EM.defer { heartbeat(:channel => subscribe.get_channels){ |e| $logger.debug('Pubnub::Client#start_respirator | bum') } }
+          end
+        end unless @env[:respirator]
+
+        $logger.debug('Pubnub'){'Pubnub::Client#start_respirator | started'}
+      end
     end
 
     def start_subscribe(override = false)
 
       start_event_machine
+      start_respirator if @env[:heartbeat]
 
       if override
-        $logger.debug('Pubnub::Client#start_subscribe | Override')
+        $logger.debug('Pubnub'){'Pubnub::Client#start_subscribe | Override'}
         @env[:subscribe_railgun].cancel
         @env[:subscribe_railgun] = nil
         @env[:wait_for_response].each do |k,v|
@@ -93,9 +106,9 @@ module Pubnub
             unless @env[:wait_for_response][origin]
               @env[:wait_for_response][origin] = true
 
-              $logger.debug('Async subscription running')
-              $logger.debug("origin: #{origin}")
-              $logger.debug("timetoken: #{@env[:timetoken]}")
+              $logger.debug('Pubnub'){'Async subscription running'}
+              $logger.debug('Pubnub'){"origin: #{origin}"}
+              $logger.debug('Pubnub'){"timetoken: #{@env[:timetoken]}"}
 
               EM.defer do
                 subscribe.start_event(self) if subscribe
@@ -105,8 +118,8 @@ module Pubnub
             end
           end
         rescue => e
-          $logger.error(e)
-          $logger.error(e.backtrace)
+          $logger.error('Pubnub'){e}
+          $logger.error('Pubnub'){e.backtrace}
         end
       end unless @env[:subscribe_railgun]
     end
@@ -123,7 +136,7 @@ module Pubnub
 
     def update_timetoken(timetoken)
       @env[:timetoken] = timetoken.to_i
-      $logger.debug("Pubnub::Client#update_timetoken | Current timetoken is eq #{@env[:timetoken]}")
+      $logger.debug('Pubnub'){"Pubnub::Client#update_timetoken | Current timetoken is eq #{@env[:timetoken]}"}
     end
 
     def set_uuid(uuid)
@@ -141,6 +154,18 @@ module Pubnub
     end
     alias_method :auth_key=, :set_auth_key
 
+    def set_heartbeat(heartbeat = nil)
+      if heartbeat
+        @env[:heartbeat] = heartbeat
+      end
+      @env[:heartbeat]
+    end
+    alias_method :heartbeat=, :set_heartbeat
+
+    def get_heartbeat
+      @env[:heartbeat]
+    end
+
     def set_cipher_key(cipher_key)
       @env[:cipher_key] = cipher_key
     end
@@ -148,9 +173,9 @@ module Pubnub
 
     def start_railgun
       if @env[:railgun]
-        $logger.debug('Pubnub::Client#start_railgun | Railgun already initialized')
+        $logger.debug('Pubnub'){'Pubnub::Client#start_railgun | Railgun already initialized'}
       else
-        $logger.debug('Pubnub::Client#start_railgun | Initializing railgun')
+        $logger.debug('Pubnub'){'Pubnub::Client#start_railgun | Initializing railgun'}
         @env[:railgun] = EM.add_periodic_timer(0.01) do
           @async_events.each do |event|
             EM.defer do
@@ -178,17 +203,17 @@ module Pubnub
     end
 
     def start_event_machine(options = nil)
-      $logger.debug 'Pubnub::Client#start_event_machine | starting EM in new thread'
+      $logger.debug('Pubnub'){'Pubnub::Client#start_event_machine | starting EM in new thread'}
       if defined?(Thin)
-        $logger.debug('Pubnub::Client#start_event_machine | We\'re running on thin')
+        $logger.debug('Pubnub'){'Pubnub::Client#start_event_machine | We\'re running on thin'}
       else
-        $logger.debug('Pubnub::Client#start_event_machine | We aren\'t running on thin')
+        $logger.debug('Pubnub'){'Pubnub::Client#start_event_machine | We aren\'t running on thin'}
       end
       if EM.reactor_running?
-        $logger.debug 'Pubnub::Client#start_event_machine | EM already running'
+        $logger.debug('Pubnub'){'Pubnub::Client#start_event_machine | EM already running'}
       else
         Thread.new { EM.run {} }
-        $logger.debug 'Pubnub::Client#start_event_machine | EM started in new thread'
+        $logger.debug('Pubnub'){'Pubnub::Client#start_event_machine | EM started in new thread'}
       end
     end
 
@@ -196,8 +221,9 @@ module Pubnub
       $logger = options[:logger] || Logger.new('pubnub.log')
       @env = symbolize_options_keys(options)
       @env = set_default_values(@env)
+      @env.delete_if { |k,v| v.blank? } # nillify if blank
       @async_events = Array.new
-      $logger.debug("\n\nCreated new Pubnub::Client instance")
+      $logger.debug('Pubnub'){"\n\nCreated new Pubnub::Client instance"}
     end
 
     def create_connections_pools(options)
@@ -226,7 +252,7 @@ module Pubnub
       }
 
       # Let's fill missing keys with default values
-      $logger.debug('Setting default values')
+      $logger.debug('Pubnub'){'Setting default values'}
       defaults.each do |key,default_value|
         env[key] = default_value if @env[key].nil?
       end
@@ -235,7 +261,7 @@ module Pubnub
     end
 
     def symbolize_options_keys(options)
-      $logger.debug('Symbolizing options keys')
+      $logger.debug('Pubnub'){'Symbolizing options keys'}
       symbolized_options = {}
       options.each_key { |k| symbolized_options.merge!({ k.to_sym => options[k] }) }
       symbolized_options

data/lib/pubnub/crypto.rb

@@ -2,13 +2,13 @@
 module Pubnub
   class Crypto
     def initialize(cipher_key)
-      $logger.debug('Initializing Crypto')
+      $logger.debug('Pubnub'){'Initializing Crypto'}
       @alg = 'AES-256-CBC'
       sha256_key = Digest::SHA256.hexdigest(cipher_key)
       @key = sha256_key.slice(0,32)
 
       @iv = '0123456789012345'
-      $logger.debug('Initialized Crypto')
+      $logger.debug('Pubnub'){'Initialized Crypto'}
     end
 
 
@@ -28,7 +28,7 @@ module Pubnub
     end
 
     def decrypt(cipher_text)
-      $logger.debug("Decrypting: #{cipher_text}")
+      $logger.debug('Pubnub'){"Decrypting: #{cipher_text}"}
       decode_cipher = OpenSSL::Cipher::Cipher.new(@alg)
       decode_cipher.decrypt
       decode_cipher.key = @key
@@ -41,8 +41,8 @@ module Pubnub
         plain_text = decode_cipher.update(undecoded_text)
         plain_text << decode_cipher.final
       rescue => e
-        $logger.error 'DECRYPTION ERROR'
-        plain_text =  '"DECRYPTION ERROR"'
+        $logger.error('Pubnub'){'DECRYPTION ERROR'}
+        plain_text = '"DECRYPTION ERROR"'
       end
 
       begin
@@ -51,7 +51,7 @@ module Pubnub
         JSON.load("[#{plain_text}]")[0] # srsly ruby? srsly?
       end
 
-      $logger.debug('Finished decrypting')
+      $logger.debug('Pubnub'){'Finished decrypting'}
 
       plain_text
 

data/lib/pubnub/event.rb

@@ -25,20 +25,21 @@ module Pubnub
       validate!
       @original_channel = format_channels(@channel, false)
       @channel          = format_channels(@channel)
-      $logger.debug("Event#initialize | Initialized #{self.class.to_s}")
+      $logger.debug('Pubnub'){"Event#initialize | Initialized #{self.class.to_s}"}
     end
 
     def fire(app)
+      $logger.debug('Pubnub'){'Pubnub::Event#fire'}
       @fired = true
-      $logger.debug('Event#fire')
+      $logger.debug('Pubnub'){'Event#fire'}
       setup_connection(app) unless connection_exist?(app)
       envelopes = start_event(app)
     end
 
     def start_event(app, count = 0)
       if count <= app.env[:max_retries]
-        $logger.debug('Event#start_event | sending request')
-        $logger.debug("Event#start_event | tt: #{@timetoken}; ctt #{app.env[:timetoken]}")
+        $logger.debug('Pubnub'){'Event#start_event | sending request'}
+        $logger.debug('Pubnub'){"Event#start_event | tt: #{@timetoken}; ctt #{app.env[:timetoken]}"}
         @response = get_connection(app).request(uri(app))
       end
 
@@ -58,7 +59,9 @@ module Pubnub
         raise ArgumentError.new(:object => self, :message => 'Invalid channel(s) format! Should be type of: String, Symbol') unless valid_channel?(false)
       end
 
-      raise ArgumentError.new(:object => self, :message => 'Callback parameter is required while using async') if (!@http_sync && @callback.blank?) && !@doesnt_require_callback
+      unless @doesnt_require_callback
+        raise ArgumentError.new(:object => self, :message => 'Callback parameter is required while using async') if (!@http_sync && @callback.blank?)
+      end
 
     end
 
@@ -80,7 +83,7 @@ module Pubnub
 
     def handle_response(response, app, error)
 
-      $logger.debug('Event#handle_response')
+      $logger.debug('Pubnub'){'Event#handle_response'}
       envelopes = format_envelopes(response, app, error)
       update_app_timetoken(envelopes, app)
       fire_callbacks(envelopes,app)
@@ -94,7 +97,7 @@ module Pubnub
     end
 
     def fire_callbacks(envelopes, app)
-      $logger.debug('Firing callbacks')
+      $logger.debug('Pubnub'){'Firing callbacks'}
       envelopes.each do |envelope|
         @callback.call(envelope)       if !envelope.error && @callback && !envelope.timetoken_update
         #if envelope.timetoken_update || envelope.timetoken.to_i > app.env[:timetoken].to_i
@@ -108,11 +111,11 @@ module Pubnub
     def update_timetoken(app, timetoken)
       @timetoken = timetoken.to_i
       app.update_timetoken(timetoken.to_i)
-      $logger.debug("Updated timetoken to #{timetoken}")
+      $logger.debug('Pubnub'){"Updated timetoken to #{timetoken}"}
     end
 
     def add_common_data_to_envelopes(envelopes, response, app, error)
-      $logger.debug('Event#add_common_data_to_envelopes')
+      $logger.debug('Pubnub'){'Event#add_common_data_to_envelopes'}
 
       envelopes.each do |envelope|
         envelope.response      = response.body
@@ -176,7 +179,7 @@ module Pubnub
     end
 
     def uri(app)
-      $logger.debug("#{self.class}#uri #{[origin(app), path(app), '?', params_hash_to_url_params(parameters(app))].join}")
+      $logger.debug('Pubnub'){"#{self.class}#uri #{[origin(app), path(app), '?', params_hash_to_url_params(parameters(app))].join}"}
       URI [origin(app), path(app), '?', params_hash_to_url_params(parameters(app))].join
     end
 
@@ -187,15 +190,15 @@ module Pubnub
 
     def parameters(app)
       required = {
-          :auth => @auth_key,
           :pnsdk => "PubNub-Ruby/#{Pubnub::VERSION}"
       }
 
       empty_if_blank = {
+          :auth => @auth_key,
           :uuid => app.env[:uuid]
       }
 
-      empty_if_blank.delete_if {|k, v| v.nil? }
+      empty_if_blank.delete_if {|k, v| v.blank? }
 
       required.merge(empty_if_blank)
     end
@@ -205,17 +208,17 @@ module Pubnub
   module SingleEvent
 
     def fire(app)
-      $logger.debug('Pubnub::SingleEvent#fire')
+      $logger.debug('Pubnub'){'Pubnub::SingleEvent#fire'}
       if @http_sync
-        $logger.debug('Pubnub::SingleEvent#fire | Sync event!')
+        $logger.debug('Pubnub'){'Pubnub::SingleEvent#fire | Sync event!'}
         super(app)
       elsif app.async_events.include? self
-        $logger.debug('Pubnub::SingleEvent#fire | Event already on list!')
+        $logger.debug('Pubnub'){'Pubnub::SingleEvent#fire | Event already on list!'}
         super(app)
       else
-        $logger.debug('Pubnub::SingleEvent#fire | Adding event to async_events')
+        $logger.debug('Pubnub'){'Pubnub::SingleEvent#fire | Adding event to async_events'}
         app.async_events << self
-        $logger.debug('Pubnub::SingleEvent#fire | Starting railgun')
+        $logger.debug('Pubnub'){'Pubnub::SingleEvent#fire | Starting railgun'}
         app.start_railgun
       end
     end
@@ -238,32 +241,41 @@ module Pubnub
       connection = Net::HTTP::Persistent.new "pubnub_ruby_client_v#{Pubnub::VERSION}"
       connection.idle_timeout = app.env[:timeout]
       connection.read_timeout = app.env[:timeout]
+      connection.proxy_from_env
       connection
     end
   end
 
   module SubscribeEvent
-
-
     def fire(app)
       begin
-        $logger.debug('SubscribeEvent#fire')
+        $logger.debug('Pubnub'){'SubscribeEvent#fire'}
         if @http_sync
-          $logger.debug('SubscribeEvent#fire sync')
-          super
+          $logger.debug('Pubnub'){'SubscribeEvent#fire sync'}
+          if self.class == Pubnub::Subscribe && app.env[:heartbeat]
+            app.heartbeat(:channel => @channel, :http_sync => true)
+            envelopes = super
+            @channel.each do |channel|
+              app.leave(:channel => channel, :http_sync => true, :skip_remove => true, :force => true) unless (app.env[:subscriptions][@origin] && app.env[:subscriptions][@origin].get_channels.include(channel))
+            end
+          else
+            envelopes = super
+          end
+          envelopes
         else
-          $logger.debug('SubscribeEvent#fire async')
-          $logger.debug("Channel: #{@channel}")
+          $logger.debug('Pubnub'){'SubscribeEvent#fire async'}
+          $logger.debug('Pubnub'){"Channel: #{@channel}"}
           setup_connection(app) unless connection_exist?(app)
           unless app.env[:subscriptions][@origin].blank?
             @channel.each do |channel|
               if app.env[:subscriptions][@origin].get_channels.include?(channel)
                 @channel.delete(channel)
-                $logger.error("Already subscribed to channel #{channel}, you have to leave that channel first")
+                $logger.error('Pubnub'){"Already subscribed to channel #{channel}, you have to leave that channel first"}
               end
-              $logger.debug('SubscribeEvent#add_channel | Adding channel')
+              $logger.debug('Pubnub'){'SubscribeEvent#add_channel | Adding channel'}
               app.env[:subscriptions][@origin].add_channel(channel, app)
             end
+            app.start_respirator
           end
 
           if app.env[:subscriptions][@origin].nil?
@@ -291,7 +303,7 @@ module Pubnub
 
         end
       rescue => error
-        $logger.error(error)
+        $logger.error('Pubnub'){error}
       end
     end
 
@@ -301,17 +313,17 @@ module Pubnub
 
     def add_channel(channel, app)
       @channel = @channel + format_channels(channel)
-      $logger.debug('SubscribeEvent#add_channel | Added channel')
+      $logger.debug('Pubnub'){'SubscribeEvent#add_channel | Added channel'}
     end
 
     def remove_channel(channel, app)
       @channel = @channel - format_channels(channel)
-      $logger.debug('SubscribeEvent#remove_channel | Removed channel')
+      $logger.debug('Pubnub'){'SubscribeEvent#remove_channel | Removed channel'}
       begin
         shutdown_subscribe(app) if @channel.empty?
       rescue => e
-        $logger.error(e.message)
-        $logger.error(e.backtrace)
+        $logger.error('Pubnub'){e.message}
+        $logger.error('Pubnub'){e.backtrace}
       end
     end
 
@@ -321,8 +333,14 @@ module Pubnub
 
     private
 
+    def parameters(app)
+      parameters = super(app)
+      parameters.merge!({:heartbeat => app.env[:heartbeat]}) if app.env[:heartbeat]
+      parameters
+    end
+
     def update_app_timetoken(envelopes, app)
-      $logger.debug('Event#update_app_timetoken')
+      $logger.debug('Pubnub'){'Event#update_app_timetoken'}
       envelopes.each do |envelope|
         if envelope.timetoken_update || envelope.timetoken.to_i > app.env[:timetoken].to_i
           update_timetoken(app, envelope.timetoken)
@@ -346,15 +364,15 @@ module Pubnub
         super
       else
         begin
-          $logger.debug('Event#fire_callbacks async')
+          $logger.debug('Pubnub'){'Event#fire_callbacks async'}
           envelopes.each do |envelope|
             app.env[:callbacks_pool][@origin][envelope.channel][:callback].call(envelope) if !envelope.error && !envelope.timetoken_update
           end
-          $logger.debug('We can send next request now')
+          $logger.debug('Pubnub'){'We can send next request now'}
           app.env[:error_callbacks_pool][@origin].call(envelopes.first) if envelopes.first.error
         rescue => error
-          $logger.error(error)
-          $logger.error(error.backtrace)
+          $logger.error('Pubnub'){error}
+          $logger.error('Pubnub'){error.backtrace}
         end
       end unless envelopes.nil?
 
@@ -395,15 +413,15 @@ module Pubnub
 
     def format_envelopes(response, app, error)
 
-      $logger.debug('Subscribe#format_envelopes')
+      $logger.debug('Pubnub'){'Subscribe#format_envelopes'}
 
       parsed_response = Parser.parse_json(response.body) if Parser.valid_json?(response.body)
 
-      $logger.debug('Subscribe#format_envelopes | Response parsed')
+      $logger.debug('Pubnub'){'Subscribe#format_envelopes | Response parsed'}
 
       envelopes = Array.new
       if error
-        $logger.debug('Subscribe#format_envelopes | Error')
+        $logger.debug('Pubnub'){'Subscribe#format_envelopes | Error'}
         envelopes << Envelope.new(
             {
                 :channel           => @channel,
@@ -412,7 +430,7 @@ module Pubnub
             app
         )
       elsif parsed_response[0].empty?
-        $logger.debug('Subscribe#format_envelopes | Timetoken')
+        $logger.debug('Pubnub'){'Subscribe#format_envelopes | Timetoken'}
         envelopes << Envelope.new(
             {
                 :channel           => @channel.first,
@@ -423,7 +441,7 @@ module Pubnub
             app
         )
       else
-        $logger.debug('Subscribe#format_envelopes | Not timetoken update')
+        $logger.debug('Pubnub'){'Subscribe#format_envelopes | Not timetoken update'}
         parsed_response[0].size.times do |i|
           if parsed_response[2].is_a? Array
             channel = parsed_response[2][i]
@@ -432,9 +450,9 @@ module Pubnub
           else
             channel = @channel.first
           end
-          $logger.debug('Subscribe#format_envelopes | Channel created')
+          $logger.debug('Pubnub'){'Subscribe#format_envelopes | Channel created'}
 
-          $logger.debug("#{parsed_response}")
+          $logger.debug('Pubnub'){"#{parsed_response}"}
 
           envelopes << Envelope.new(
               {
@@ -446,12 +464,12 @@ module Pubnub
               app
           )
 
-          $logger.debug('Subscribe#format_envelopes | Envelopes created')
+          $logger.debug('Pubnub'){'Subscribe#format_envelopes | Envelopes created'}
 
         end
       end
 
-      $logger.debug('Subscribe#format_envelopes | envelopes created')
+      $logger.debug('Pubnub'){'Subscribe#format_envelopes | envelopes created'}
 
       envelopes = add_common_data_to_envelopes(envelopes, response, app, error)
 
@@ -464,6 +482,7 @@ module Pubnub
       connection.idle_timeout   = app.env[:subscribe_timeout]
       connection.read_timeout   = app.env[:subscribe_timeout]
       @connect_callback.call "New subscribe connection to #{@origin}"
+      connection.proxy_from_env   
       connection
     end
   end