pubnub 3.7.0 → 3.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bfd5538b26675782f56350179deedd2806381507
-  data.tar.gz: afd697119dafc00c909f3e4ca3e69d83658af633
+  metadata.gz: a4b1a3482014d1b1506b37bc8740aca689461aa4
+  data.tar.gz: c8b546230f0cb24477739c34b9e9cdd168ceff1a
 SHA512:
-  metadata.gz: 859506af0ab59f9d66e926a220bee8bb462accba1ec03d9dfbe8bc102694751171621754bd0489180b4a2b63a1888cc04083d86a21efd4838de8cad10258e4cc
-  data.tar.gz: 2d514980a3f04733bac4282ec8d114c47733f100129c0a21c38afbf9fa9def8a38bf5c9f1dea49d63a2f0a55d4f6ab1755aeaf2d4320a3915cca3b563ccffa10
+  metadata.gz: 1c6dd571ce7820226c2888749c699f40ad0c5370668f8a1486e0b53ea9d7dd46c2260f927e81e694ec51c8b075b565d6c5dc97aee29bf5482922b029429c52bb
+  data.tar.gz: 6ae74d44a8a982668c73c4193875f95b6c504dd9acd77067c24b1627b6a43e857c550f8369dde6a45e7c3525959353c25e4d76be444226478f3f1abd1f61f81f

data/CHANGELOG.txt

@@ -1,3 +1,6 @@
+3.7.1 Release
+. Fixed memory leak
+
 3.7.0 Release
 . Added channel groups features
 

data/Gemfile

@@ -9,4 +9,6 @@ group :development do
   gem 'pry'
   gem 'webmock'
   gem 'awesome_print'
+  gem 'ruby-prof'
+  gem 'memory_profiler'
 end

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    pubnub (3.7.0beta0)
+    pubnub (3.7.0)
       eventmachine (~> 1.0)
       json (~> 1.8)
       net-http-persistent (~> 2.9)
@@ -15,8 +15,9 @@ GEM
     crack (0.4.2)
       safe_yaml (~> 1.0.0)
     diff-lcs (1.2.5)
-    eventmachine (1.0.3)
-    json (1.8.1)
+    eventmachine (1.0.7)
+    json (1.8.2)
+    memory_profiler (0.0.4)
     method_source (0.8.2)
     net-http-persistent (2.9.4)
     pry (0.10.0)
@@ -32,6 +33,7 @@ GEM
     rspec-expectations (2.14.5)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.14.6)
+    ruby-prof (0.15.3)
     safe_yaml (1.0.3)
     slop (3.5.0)
     vcr (2.9.2)
@@ -45,9 +47,11 @@ PLATFORMS
 DEPENDENCIES
   awesome_print
   bundler (~> 1.6)
+  memory_profiler
   pry
   pubnub!
   rr
   rspec (= 2.14)
+  ruby-prof
   vcr
   webmock

data/README.md

@@ -1,6 +1,6 @@
 # Please direct all Support Questions and Concerns to Support@PubNub.com
 
-## PubNub Gem version 3.7.0
+## PubNub Gem version 3.7.1
 
 ##### YOU MUST HAVE A PUBNUB ACCOUNT TO USE THE API.
 ##### http://www.pubnub.com/account
@@ -17,10 +17,10 @@ We've made the response format compatible across all operations. This may break
 Examples of affected operations can be found [here](3.5_to_3.6_upgrade_notes.md).
 
 ### Upgrading from PubNub 3.3.x and Earlier
-PubNub 3.7.0 is NOT compatible with earlier than 3.4 versions of Pubnub Ruby Client.
+PubNub 3.7.1 is NOT compatible with earlier than 3.4 versions of Pubnub Ruby Client.
 
 ### Upgrading from PubNub 3.4 and higher versions
-PubNub 3.7.0 is compatible with 3.4 version.
+PubNub 3.7.1 is compatible with 3.4 version.
 
 ## Important Notice about Blocking vs Non-Blocking Calls
 

data/lib/pubnub.rb

@@ -43,6 +43,8 @@ end
 
 module Pubnub
   class << self
+    attr_accessor :logger
+
     def new(options = {})
       Pubnub::Client.new(options)
     end

data/lib/pubnub/client.rb

@@ -27,7 +27,7 @@ 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('Pubnub'){'Created event ' + event.class.to_s}
+        Pubnub.logger.debug(:pubnub){'Created event ' + event.class.to_s}
         event.fire(self)
       end
     end
@@ -105,11 +105,11 @@ module Pubnub
 
       EM.stop if stop_em
 
-      $logger.info('Pubnub'){'Bye!'}
+      Pubnub.logger.info(:pubnub){'Bye!'}
     end
 
     def stop_async
-      $logger.debug('Pubnub'){'Pubnub::Client#stop_async | fired'}
+      Pubnub.logger.debug(:pubnub){'Pubnub::Client#stop_async | fired'}
       @env[:subscribe_railgun].cancel unless @env[:subscribe_railgun].blank?
       @env[:respirator].cancel        unless @env[:respirator].blank?
       @env[:subscribe_railgun].cancel unless @env[:subscribe_railgun].blank?
@@ -120,7 +120,7 @@ module Pubnub
 
       EM.stop
 
-      $logger.debug('Pubnub'){'Pubnub::Client#stop_async | timers killed'}
+      Pubnub.logger.debug(:pubnub){'Pubnub::Client#stop_async | timers killed'}
     end
 
     def restore_async
@@ -130,24 +130,24 @@ module Pubnub
     end
 
     def start_respirator
-      $logger.debug('Pubnub'){'Pubnub::Client#start_respirator | fired'}
+      Pubnub.logger.debug(:pubnub){'Pubnub::Client#start_respirator | fired'}
       if @env[:heartbeat]
-        $logger.debug('Pubnub'){'Pubnub::Client#start_respirator | starting'}
+        Pubnub.logger.debug(:pubnub){'Pubnub::Client#start_respirator | starting'}
 
         if @env[:heartbeat] != @env[:respirator].interval
-          $logger.debug('Pubnub'){'Pubnub::Client#start_respirator | destroy old respirator'}
+          Pubnub.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, :group => subscribe.get_channel_groups ){ |e| $logger.debug('Pubnub::Client#start_respirator | bum') } }
+            Pubnub.logger.debug(:pubnub){'Pubnub::Client#start_respirator | BUM'}
+            EM.defer { heartbeat(:channel => subscribe.get_channels, :group => subscribe.get_channel_groups ){ |e| Pubnub.logger.debug('Pubnub::Client#start_respirator | bum') } }
           end
         end unless @env[:respirator]
 
-        $logger.debug('Pubnub'){'Pubnub::Client#start_respirator | started'}
+        Pubnub.logger.debug(:pubnub){'Pubnub::Client#start_respirator | started'}
       end
     end
 
@@ -157,7 +157,7 @@ module Pubnub
       start_respirator if @env[:heartbeat]
 
       if override
-        $logger.debug('Pubnub'){'Pubnub::Client#start_subscribe | Override'}
+        Pubnub.logger.debug(:pubnub){'Pubnub::Client#start_subscribe | Override'}
         @env[:subscribe_railgun].cancel
         @env[:subscribe_railgun] = nil
         @env[:wait_for_response].each do |k,v|
@@ -166,7 +166,7 @@ module Pubnub
       end
 
       if @env[:subscribe_railgun] && @subscribe_deffered_thread
-        $logger.debug('Pubnub'){'Pubnub::Client#start_subscribe | Aborting previous request'}
+        Pubnub.logger.debug(:pubnub){'Pubnub::Client#start_subscribe | Aborting previous request'}
         @subscribe_deffered_thread.kill
         Thread.pass until @subscribe_deffered_thread.status == false
       end
@@ -179,9 +179,9 @@ module Pubnub
               unless @env[:wait_for_response][origin]
                 @env[:wait_for_response][origin] = true
 
-                $logger.debug('Pubnub'){'Async subscription running'}
-                $logger.debug('Pubnub'){"origin: #{origin}"}
-                $logger.debug('Pubnub'){"timetoken: #{@env[:timetoken]}"}
+                Pubnub.logger.debug(:pubnub){'Async subscription running'}
+                Pubnub.logger.debug(:pubnub){"origin: #{origin}"}
+                Pubnub.logger.debug(:pubnub){"timetoken: #{@env[:timetoken]}"}
 
                 EM.defer do
                   @subscribe_deffered_thread = Thread.current
@@ -192,8 +192,8 @@ module Pubnub
               end
             end
           rescue => e
-            $logger.error('Pubnub'){e}
-            $logger.error('Pubnub'){e.backtrace}
+            Pubnub.logger.error(:pubnub){e}
+            Pubnub.logger.error(:pubnub){e.backtrace}
           end
         end
       end
@@ -211,7 +211,7 @@ module Pubnub
 
     def update_timetoken(timetoken)
       @env[:timetoken] = timetoken.to_i
-      $logger.debug('Pubnub'){"Pubnub::Client#update_timetoken | Current timetoken is eq #{@env[:timetoken]}"}
+      Pubnub.logger.debug(:pubnub){"Pubnub::Client#update_timetoken | Current timetoken is eq #{@env[:timetoken]}"}
     end
 
     def set_uuid(uuid)
@@ -253,16 +253,16 @@ module Pubnub
     def start_railgun
       start_event_machine(@env)
       if @env[:railgun]
-        $logger.debug('Pubnub'){'Pubnub::Client#start_railgun | Railgun already initialized'}
+        Pubnub.logger.debug(:pubnub){'Pubnub::Client#start_railgun | Railgun already initialized'}
       else
-        $logger.debug('Pubnub'){'Pubnub::Client#start_railgun | Initializing railgun'}
+        Pubnub.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
-              event.fire(self) unless event.fired
+              event.fire(self) unless event.fired?
             end
           end
-          @async_events.delete_if {|event| event.finished }
+          @async_events.delete_if {|event| event.finished? }
         end
       end
     end
@@ -287,28 +287,28 @@ module Pubnub
     end
 
     def start_event_machine(options = nil)
-      $logger.debug('Pubnub'){'Pubnub::Client#start_event_machine | starting EM in new thread'}
+      Pubnub.logger.debug(:pubnub){'Pubnub::Client#start_event_machine | starting EM in new thread'}
       if defined?(Thin)
-        $logger.debug('Pubnub'){'Pubnub::Client#start_event_machine | We\'re running on thin'}
+        Pubnub.logger.debug(:pubnub){'Pubnub::Client#start_event_machine | We\'re running on thin'}
       else
-        $logger.debug('Pubnub'){'Pubnub::Client#start_event_machine | We aren\'t running on thin'}
+        Pubnub.logger.debug(:pubnub){'Pubnub::Client#start_event_machine | We aren\'t running on thin'}
       end
       if EM.reactor_running?
-        $logger.debug('Pubnub'){'Pubnub::Client#start_event_machine | EM already running'}
+        Pubnub.logger.debug(:pubnub){'Pubnub::Client#start_event_machine | EM already running'}
       else
         Thread.new { EM.run {} }
         Thread.pass until EM.reactor_running?
-        $logger.debug('Pubnub'){'Pubnub::Client#start_event_machine | EM started in new thread'}
+        Pubnub.logger.debug(:pubnub){'Pubnub::Client#start_event_machine | EM started in new thread'}
       end
     end
 
     def setup_app(options)
-      $logger = options[:logger] || Logger.new('pubnub.log')
+      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
+      @env.delete_if { |_,v| v.blank? } # nillify if blank
       @async_events = Array.new
-      $logger.debug('Pubnub'){"\n\nCreated new Pubnub::Client instance"}
+      Pubnub.logger.debug(:pubnub){"\n\nCreated new Pubnub::Client instance"}
     end
 
     def create_connections_pools(options)
@@ -337,7 +337,7 @@ module Pubnub
       }
 
       # Let's fill missing keys with default values
-      $logger.debug('Pubnub'){'Setting default values'}
+      Pubnub.logger.debug(:pubnub){'Setting default values'}
       defaults.each do |key,default_value|
         env[key] = default_value if @env[key].nil?
       end
@@ -346,7 +346,7 @@ module Pubnub
     end
 
     def symbolize_options_keys(options)
-      $logger.debug('Pubnub'){'Symbolizing options keys'}
+      Pubnub.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('Pubnub'){'Initializing Crypto'}
+      Pubnub.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('Pubnub'){'Initialized Crypto'}
+      Pubnub.logger.debug(:pubnub){'Initialized Crypto'}
     end
 
 
@@ -28,7 +28,7 @@ module Pubnub
     end
 
     def decrypt(cipher_text)
-      $logger.debug('Pubnub'){"Decrypting: #{cipher_text}"}
+      Pubnub.logger.debug(:pubnub){"Decrypting: #{cipher_text}"}
       decode_cipher = OpenSSL::Cipher::Cipher.new(@alg)
       decode_cipher.decrypt
       decode_cipher.key = @key
@@ -41,7 +41,7 @@ module Pubnub
         plain_text = decode_cipher.update(undecoded_text)
         plain_text << decode_cipher.final
       rescue => e
-        $logger.error('Pubnub'){'DECRYPTION ERROR'}
+        Pubnub.logger.error(:pubnub){'DECRYPTION ERROR'}
         plain_text = '"DECRYPTION ERROR"'
       end
 
@@ -51,7 +51,7 @@ module Pubnub
         JSON.load("[#{plain_text}]")[0] # srsly ruby? srsly?
       end
 
-      $logger.debug('Pubnub'){'Finished decrypting'}
+      Pubnub.logger.debug(:pubnub){'Finished decrypting'}
 
       plain_text
 

data/lib/pubnub/event.rb

@@ -31,13 +31,13 @@ module Pubnub
       @channel          = format_channels(@channel)
       @channel_group    = format_channel_group(options[:group], false)
       @original_channel = format_channels(@channel, false)
-      $logger.debug('Pubnub'){"Event#initialize | Initialized #{self.class.to_s}"}
+      Pubnub.logger.debug(:pubnub){"Event#initialize | Initialized #{self.class.to_s}"}
     end
 
     def fire(app)
-      $logger.debug('Pubnub'){'Pubnub::Event#fire'}
+      Pubnub.logger.debug(:pubnub){'Pubnub::Event#fire'}
       @fired = true
-      $logger.debug('Pubnub'){'Event#fire'}
+      Pubnub.logger.debug(:pubnub){'Event#fire'}
       setup_connection(app) unless connection_exist?(app)
       envelopes = start_event(app)
     end
@@ -53,8 +53,8 @@ module Pubnub
     def start_event(app, count = 0)
       begin
         if count <= app.env[:max_retries]
-          $logger.debug('Pubnub'){'Event#start_event | sending request'}
-          $logger.debug('Pubnub'){"Event#start_event | tt: #{@timetoken}; ctt #{app.env[:timetoken]}"}
+          Pubnub.logger.debug(:pubnub){'Event#start_event | sending request'}
+          Pubnub.logger.debug(:pubnub){"Event#start_event | tt: #{@timetoken}; ctt #{app.env[:timetoken]}"}
           @response = send_request(app)
         end
 
@@ -66,11 +66,11 @@ module Pubnub
           start_event(app, count + 1)
         end
       rescue => e
-        $logger.error('Pubnub'){e.inspect}
+        Pubnub.logger.error(:pubnub){e.inspect}
         if count <= app.env[:max_retries]
           start_event(app, count + 1)
         else
-          $logger.error('Pubnub'){"Aborting #{self.class} event due to network errors and reaching max retries"}
+          Pubnub.logger.error(:pubnub){"Aborting #{self.class} event due to network errors and reaching max retries"}
         end
         false
       end
@@ -89,6 +89,14 @@ module Pubnub
 
     end
 
+    def finished?
+      @finished ? true : false
+    end
+
+    def fired?
+      @fired ? true : false
+    end
+
     private
 
     def response_error(response, app)
@@ -107,12 +115,12 @@ module Pubnub
 
     def handle_response(response, app, error)
 
-      $logger.debug('Pubnub'){'Event#handle_response'}
+      Pubnub.logger.debug(:pubnub){'Event#handle_response'}
       envelopes = format_envelopes(response, app, error)
-      $logger.debug('Pubnub'){"Response: #{response.body}"} if (response && response.body)
+      Pubnub.logger.debug(:pubnub){"Response: #{response.body}"} if (response && response.body)
       update_app_timetoken(envelopes, app)
-      fire_callbacks(envelopes,app)
       @finished = true
+      fire_callbacks(envelopes,app)
       envelopes
 
     end
@@ -123,27 +131,29 @@ module Pubnub
 
     def fire_callbacks(envelopes, app)
       unless envelopes.blank?
-        $logger.debug('Pubnub'){'Firing callbacks'}
-        envelopes.each do |envelope|
-          @callback.call(envelope)       if envelope && !envelope.error && @callback && !envelope.timetoken_update
-          #if envelope.timetoken_update || envelope.timetoken.to_i > app.env[:timetoken].to_i
-          #  update_timetoken(app, envelope.timetoken)
-          #end
-        end
-        @error_callback.call(envelopes.first) if envelopes.first.error
+        Pubnub.logger.debug(:pubnub){'Firing callbacks'}
+        # EM.defer do
+          envelopes.each do |envelope|
+            @callback.call(envelope)       if envelope && !envelope.error && @callback && !envelope.timetoken_update
+            #if envelope.timetoken_update || envelope.timetoken.to_i > app.env[:timetoken].to_i
+            #  update_timetoken(app, envelope.timetoken)
+            #end
+          end
+          @error_callback.call(envelopes.first) if envelopes.first.error
+        # end
       else
-        $logger.debug('Pubnub'){'No envelopes for callback'}
+        Pubnub.logger.debug(:pubnub){'No envelopes for callback'}
       end
     end
 
     def update_timetoken(app, timetoken)
       @timetoken = timetoken.to_i
       app.update_timetoken(timetoken.to_i)
-      $logger.debug('Pubnub'){"Updated timetoken to #{timetoken}"}
+      Pubnub.logger.debug(:pubnub){"Updated timetoken to #{timetoken}"}
     end
 
     def add_common_data_to_envelopes(envelopes, response, app, error)
-      $logger.debug('Pubnub'){'Event#add_common_data_to_envelopes'}
+      Pubnub.logger.debug(:pubnub){'Event#add_common_data_to_envelopes'}
 
       envelopes.each do |envelope|
         envelope.response      = response.body
@@ -207,7 +217,7 @@ module Pubnub
     end
 
     def uri(app)
-      $logger.debug('Pubnub'){"#{self.class}#uri #{[origin(app), path(app), '?', params_hash_to_url_params(parameters(app))].join}"}
+      Pubnub.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
 
@@ -236,17 +246,17 @@ module Pubnub
   module SingleEvent
 
     def fire(app)
-      $logger.debug('Pubnub'){'Pubnub::SingleEvent#fire'}
+      Pubnub.logger.debug(:pubnub){'Pubnub::SingleEvent#fire'}
       if @http_sync
-        $logger.debug('Pubnub'){'Pubnub::SingleEvent#fire | Sync event!'}
+        Pubnub.logger.debug(:pubnub){'Pubnub::SingleEvent#fire | Sync event!'}
         super(app)
       elsif app.async_events.include? self
-        $logger.debug('Pubnub'){'Pubnub::SingleEvent#fire | Event already on list!'}
+        Pubnub.logger.debug(:pubnub){'Pubnub::SingleEvent#fire | Event already on list!'}
         super(app)
       else
-        $logger.debug('Pubnub'){'Pubnub::SingleEvent#fire | Adding event to async_events'}
+        Pubnub.logger.debug(:pubnub){'Pubnub::SingleEvent#fire | Adding event to async_events'}
         app.async_events << self
-        $logger.debug('Pubnub'){'Pubnub::SingleEvent#fire | Starting railgun'}
+        Pubnub.logger.debug(:pubnub){'Pubnub::SingleEvent#fire | Starting railgun'}
         app.start_railgun
       end
     end
@@ -283,9 +293,9 @@ module Pubnub
 
     def fire(app)
       begin
-        $logger.debug('Pubnub'){'SubscribeEvent#fire'}
+        Pubnub.logger.debug(:pubnub){'SubscribeEvent#fire'}
         if @http_sync
-          $logger.debug('Pubnub'){'SubscribeEvent#fire sync'}
+          Pubnub.logger.debug(:pubnub){'SubscribeEvent#fire sync'}
           if self.class == Pubnub::Subscribe && app.env[:heartbeat]
             app.heartbeat(:channel => @channel, :http_sync => true)
             envelopes = super
@@ -297,26 +307,26 @@ module Pubnub
           end
           envelopes
         else
-          $logger.debug('Pubnub'){'SubscribeEvent#fire async'}
-          $logger.debug('Pubnub'){"Channel: #{@channel}"}
+          Pubnub.logger.debug(:pubnub){'SubscribeEvent#fire async'}
+          Pubnub.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('Pubnub'){"Already subscribed to channel #{channel}, you have to leave that channel first"}
+                Pubnub.logger.error(:pubnub){"Already subscribed to channel #{channel}, you have to leave that channel first"}
               end
             end
 
             @channel.each do |channel|
-              $logger.debug('Pubnub'){'SubscribeEvent#add_channel | Adding channel'}
+              Pubnub.logger.debug(:pubnub){'SubscribeEvent#add_channel | Adding channel'}
               app.env[:subscriptions][@origin].add_channel(channel, app)
             end
 
             @channel_group.each do |cg|
               if app.env[:subscriptions][@origin].get_channel_groups.include?(cg)
                 @channel_group.delete(cg)
-                $logger.error('Pubnub'){"Already subscribed to channel group #{cg}, you have to leave that channel first"}
+                Pubnub.logger.error(:pubnub){"Already subscribed to channel group #{cg}, you have to leave that channel first"}
               else
                 app.env[:subscriptions][@origin].add_channel_group(cg, app)
               end
@@ -375,7 +385,7 @@ module Pubnub
 
         end
       rescue => error
-        $logger.error('Pubnub'){error}
+        Pubnub.logger.error(:pubnub){error}
       end
     end
 
@@ -385,33 +395,33 @@ module Pubnub
 
     def add_channel_group(cg, app)
       @channel_group << cg
-      $logger.debug('Pubnub'){'SubscribeEvent#add_channel | Added channel'}
+      Pubnub.logger.debug(:pubnub){'SubscribeEvent#add_channel | Added channel'}
     end
 
     def add_channel(channel, app)
       @channel = @channel + format_channels(channel)
-      $logger.debug('Pubnub'){'SubscribeEvent#add_channel | Added channel'}
+      Pubnub.logger.debug(:pubnub){'SubscribeEvent#add_channel | Added channel'}
     end
 
     def remove_channel(channel, app)
       @channel = @channel - format_channels(channel)
-      $logger.debug('Pubnub'){'SubscribeEvent#remove_channel | Removed channel'}
+      Pubnub.logger.debug(:pubnub){'SubscribeEvent#remove_channel | Removed channel'}
       begin
         shutdown_subscribe(app) if @channel.empty? && @channel_group.empty?
       rescue => e
-        $logger.error('Pubnub'){e.message}
-        $logger.error('Pubnub'){e.backtrace}
+        Pubnub.logger.error(:pubnub){e.message}
+        Pubnub.logger.error(:pubnub){e.backtrace}
       end
     end
 
     def remove_channel_group(channel_group, app)
       @channel_group = @channel_group - format_channel_group(channel_group, false)
-      $logger.debug('Pubnub'){'SubscribeEvent#remove_channel | Removed channel'}
+      Pubnub.logger.debug(:pubnub){'SubscribeEvent#remove_channel | Removed channel'}
       begin
         shutdown_subscribe(app) if @channel.empty? && @channel_group.empty?
       rescue => e
-        $logger.error('Pubnub'){e.message}
-        $logger.error('Pubnub'){e.backtrace}
+        Pubnub.logger.error(:pubnub){e.message}
+        Pubnub.logger.error(:pubnub){e.backtrace}
       end
     end
 
@@ -438,7 +448,7 @@ module Pubnub
     end
 
     def update_app_timetoken(envelopes, app)
-      $logger.debug('Pubnub'){'Event#update_app_timetoken'}
+      Pubnub.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)
@@ -462,7 +472,7 @@ module Pubnub
         super
       else
         begin
-          $logger.debug('Pubnub'){'Event#fire_callbacks async'}
+          Pubnub.logger.debug(:pubnub){'Event#fire_callbacks async'}
           envelopes.each do |envelope|
             if envelope.channel_group && app.env[:callbacks_pool][:channel_group][@origin][envelope.channel_group]
               app.env[:callbacks_pool][:channel_group][@origin][envelope.channel_group][:callback].call(envelope) if !envelope.error && !envelope.timetoken_update
@@ -470,13 +480,13 @@ module Pubnub
               app.env[:callbacks_pool][:channel][@origin][envelope.channel][:callback].call(envelope) if !envelope.error && !envelope.timetoken_update
             end
           end
-          $logger.debug('Pubnub'){'We can send next request now'}
+          Pubnub.logger.debug(:pubnub){'We can send next request now'}
           app.env[:error_callbacks_pool][:channel][@origin].call(envelopes.first)       if envelopes.first.error && !envelopes.first.channel_group
           app.env[:error_callbacks_pool][:channel_group][@origin].call(envelopes.first) if envelopes.first.error &&  envelopes.first.channel_group
 
         rescue => error
-          $logger.error('Pubnub'){error}
-          $logger.error('Pubnub'){error.backtrace}
+          Pubnub.logger.error(:pubnub){error}
+          Pubnub.logger.error(:pubnub){error.backtrace}
         end
       end unless envelopes.nil?
 
@@ -513,15 +523,15 @@ module Pubnub
 
     def format_envelopes(response, app, error)
 
-      $logger.debug('Pubnub'){'Subscribe#format_envelopes'}
+      Pubnub.logger.debug(:pubnub){'Subscribe#format_envelopes'}
 
       parsed_response = Parser.parse_json(response.body) if Parser.valid_json?(response.body)
 
-      $logger.debug('Pubnub'){'Subscribe#format_envelopes | Response parsed'}
+      Pubnub.logger.debug(:pubnub){'Subscribe#format_envelopes | Response parsed'}
 
       envelopes = Array.new
       if error
-        $logger.debug('Pubnub'){'Subscribe#format_envelopes | Error'}
+        Pubnub.logger.debug(:pubnub){'Subscribe#format_envelopes | Error'}
         envelopes << Envelope.new(
             {
                 :channel           => @channel,
@@ -530,7 +540,7 @@ module Pubnub
             app
         )
       elsif parsed_response[0].empty?
-        $logger.debug('Pubnub'){'Subscribe#format_envelopes | Timetoken'}
+        Pubnub.logger.debug(:pubnub){'Subscribe#format_envelopes | Timetoken'}
         envelopes << Envelope.new(
             {
                 :channel           => @channel.first,
@@ -541,7 +551,7 @@ module Pubnub
             app
         )
       elsif parsed_response.length < 4
-        $logger.debug('Pubnub'){'Subscribe#format_envelopes | Not timetoken update'}
+        Pubnub.logger.debug(:pubnub){'Subscribe#format_envelopes | Not timetoken update'}
 
         if parsed_response[2]
           channels = parsed_response[2].split(',')
@@ -555,9 +565,9 @@ module Pubnub
           else
             channel = channels[i]
           end
-          $logger.debug('Pubnub'){"Subscribe#format_envelopes | Channel #{channel} created"}
+          Pubnub.logger.debug(:pubnub){"Subscribe#format_envelopes | Channel #{channel} created"}
 
-          $logger.debug('Pubnub'){"#{parsed_response}"}
+          Pubnub.logger.debug(:pubnub){"#{parsed_response}"}
 
           envelopes << Envelope.new(
               {
@@ -569,17 +579,17 @@ module Pubnub
               app
           )
 
-          $logger.debug('Pubnub'){'Subscribe#format_envelopes | Envelopes created'}
+          Pubnub.logger.debug(:pubnub){'Subscribe#format_envelopes | Envelopes created'}
 
         end
       else
-        $logger.debug('Pubnub'){'Subscribe#format_envelopes | Not timetoken update'}
+        Pubnub.logger.debug(:pubnub){'Subscribe#format_envelopes | Not timetoken update'}
 
         parsed_response[0].size.times do |i|
           channel       = parsed_response[3].split(',')[i]
           channel_group = parsed_response[2].split(',')[i]
 
-          $logger.debug('Pubnub'){"#{parsed_response}"}
+          Pubnub.logger.debug(:pubnub){"#{parsed_response}"}
 
           envelopes << Envelope.new(
               {
@@ -592,12 +602,12 @@ module Pubnub
               app
           )
 
-          $logger.debug('Pubnub'){'Subscribe#format_envelopes | Envelopes created'}
+          Pubnub.logger.debug(:pubnub){'Subscribe#format_envelopes | Envelopes created'}
 
         end
       end
 
-      $logger.debug('Pubnub'){'Subscribe#format_envelopes | envelopes created'}
+      Pubnub.logger.debug(:pubnub){'Subscribe#format_envelopes | envelopes created'}
 
       envelopes = add_common_data_to_envelopes(envelopes, response, app, error)