apns_kit 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d2a8a7b77cfad1dc15ed5ecd77a1f94c3e573d26
-  data.tar.gz: e1f79c125380960ff087382fcdf258b3752bac36
+  metadata.gz: 2eca2c85bbb5fd1f118954f2f84268617eb448a8
+  data.tar.gz: 4f3b323f129aa24d9e08b6728855b28d6cfd785f
 SHA512:
-  metadata.gz: 7e4efdda5e415dc9921b75ddd4133debb854c7fae033a2e796473894cee9652b195c608a80429e6cdcb92cfc201d1a601b0adf31b475c514e682116cd412ef4f
-  data.tar.gz: 7a8c8b7fad2b2cebfbbe6ea9e296bee7e39732d71ac81581887b24f37cb399c76b30f32014a78647c6c9f363ef6039074f4f71bab89a18dc67659ad114bf1903
+  metadata.gz: aeb77a312ffae634dd3d9999cade4c3965aa8319ff72cd4e4d0a63aa696128f0735d7da8064da602375deeb0a25a3b6dbc7f8fee182436d3d21cdf99c83c326a
+  data.tar.gz: 8158857321754b9683a473ab2c591a41b475b928b4ed5c75796416cbc162b5caa4b4ad734ccbd897f7ba7bb890348e3da8e917a3bdc6631b101be959692f08a0

data/lib/apns_kit.rb

@@ -10,6 +10,8 @@ require "logger"
 module ApnsKit
     class << self
 
+        PREFIX = "ApnsKit".freeze
+
         def logger
             return @logger if defined?(@logger)
             @logger = rails_logger || default_logger
@@ -19,12 +21,29 @@ module ApnsKit
             @logger = logger
         end
 
+        def log_debug(message)
+            logger.debug(format_message(message)) if logger.debug?
+        end
+
+        def log_error(message)
+            logger.error(format_message(message)) if logger.error?
+        end
+
+        def log_fatal(message)
+            logger.fatal(format_message(message)) if logger.fatal?
+        end
+
+        def log_info(message)
+            logger.info(format_message(message)) if logger.info?
+        end
+
+        def log_warn(message)
+            logger.warn(format_message(message)) if logger.warn?
+        end
+
         def default_logger
             logger = Logger.new($stdout)
             logger.level = Logger::INFO
-            logger.formatter = proc do |severity, datetime, progname, msg|
-                "[#{datetime} ##{$$}] #{severity} -- : APNs Kit | #{msg}\n"
-            end
             logger
         end
 
@@ -32,5 +51,11 @@ module ApnsKit
             defined?(::Rails) && ::Rails.respond_to?(:logger) && ::Rails.logger
         end
 
+        private
+
+        def format_message(message)
+            format("%s | %s".freeze, PREFIX, message)
+        end
+
     end
 end

data/lib/apns_kit/client.rb

@@ -32,7 +32,7 @@ module ApnsKit
             @connection_pool = @pool_size.times.map { ApnsKit::Connection.new(uri, certificate) }.freeze
             @default_topic = certificate.app_bundle_id
             if heartbeat_interval > 0
-                ApnsKit.logger.info("Setting up heartbeat checker")
+                ApnsKit.log_info("Setting up heartbeat checker")
                 @heartbeat_checker = Concurrent::TimerTask.new { @connection_pool.each(&:ping) }
                 @heartbeat_checker.execution_interval = heartbeat_interval
                 @heartbeat_checker.execute

data/lib/apns_kit/connection.rb

@@ -32,7 +32,7 @@ module ApnsKit
 
         def ping
             if @http
-                ApnsKit.logger.debug("Sending ping")
+                ApnsKit.log_debug("Sending ping")
                 @http.ping("whatever")
             end
         end
@@ -41,7 +41,7 @@ module ApnsKit
 
         def setup_connection!
             @mutex.synchronize do
-                ApnsKit.logger.info("Setting up connection")
+                ApnsKit.log_info("Setting up connection")
                 ctx = @certificate.ssl_context
                 tcp = TCPSocket.new(@uri.host, @uri.port)
 
@@ -55,13 +55,13 @@ module ApnsKit
 
                 @http = HTTP2::Client.new
                 @http.on(:frame) do |bytes|
-                    ApnsKit.logger.debug("Sending bytes: #{bytes.unpack("H*").first}")
+                    ApnsKit.log_debug("Sending bytes: #{bytes.unpack("H*").first}")
                     @socket.print bytes
                     @socket.flush
                 end
 
                 ping
-                ApnsKit.logger.info("Connection established")
+                ApnsKit.log_info("Connection established")
             end
         end
 
@@ -72,17 +72,17 @@ module ApnsKit
                     begin
                         if @socket.closed?
                             close_connection!
-                            ApnsKit.logger.warn("Socket was closed")
+                            ApnsKit.log_warn("Socket was closed")
                             break
                         elsif !@socket.eof?
                             data = @socket.readpartial(1024)
-                            ApnsKit.logger.debug("Received bytes: #{data.unpack("H*").first}")
+                            ApnsKit.log_debug("Received bytes: #{data.unpack("H*").first}")
                             @http << data
                         end
                     rescue => e
                         close_connection!
-                        ApnsKit.logger.warn("#{e.class} exception: #{e.message} - closing socket")
-                        e.backtrace.each { |l| ApnsKit.logger.debug(l) }
+                        ApnsKit.log_warn("#{e.class} exception: #{e.message} - closing socket")
+                        e.backtrace.each { |l| ApnsKit.log_debug(l) }
                         raise e
                     end
                 end
@@ -98,11 +98,11 @@ module ApnsKit
 
         def close_connection!
             @mutex.synchronize do
-                ApnsKit.logger.info("Closing connection")
+                ApnsKit.log_info("Closing connection")
                 @socket.close if @socket
                 @connected = false
                 @http = nil
-                ApnsKit.logger.info("Connection closed")
+                ApnsKit.log_info("Connection closed")
             end
         end
 

data/lib/apns_kit/request.rb

@@ -26,7 +26,7 @@ module ApnsKit
         def perform_nonblocking_send(connection)
             connection.open
 
-            ApnsKit.logger.info("Sending #{@notifications.size} notifications")
+            ApnsKit.log_info("Sending #{@notifications.size} notifications")
             @notifications.each do |notification|
                 stream = connection.http.new_stream
 
@@ -36,7 +36,7 @@ module ApnsKit
                 stream.on(:headers) do |headers|
                     headers = Hash[*headers.flatten]
                     response.headers = headers
-                    ApnsKit.logger.debug("Received headers #{headers}")
+                    ApnsKit.log_debug("Received headers #{headers}")
                     if response.success?
                         yield response if block_given?
                     end
@@ -45,7 +45,7 @@ module ApnsKit
                 stream.on(:data) do |data|
                     response.raw_body ||= ""
                     response.raw_body << data
-                    ApnsKit.logger.debug("Received data #{data}")
+                    ApnsKit.log_debug("Received data #{data}")
                     yield response if block_given?
                 end
 

data/lib/apns_kit/version.rb

@@ -1,3 +1,3 @@
 module ApnsKit
-    VERSION = "0.1.0"
+    VERSION = "0.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apns_kit
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Chris Recalis
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-04-18 00:00:00.000000000 Z
+date: 2016-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http-2