push-gcm 1.0.0 → 1.0.1

data/lib/push-gcm/version.rb

@@ -1,3 +1,3 @@
 module PushGcm
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

data/lib/push/daemon/gcm_support/connection_gcm.rb

@@ -1,6 +1,8 @@
 module Push
   module Daemon
     module GcmSupport
+      class ConnectionError < StandardError; end
+
       class ConnectionGcm
         attr_reader :response, :name, :provider
         PUSH_URL = "https://android.googleapis.com/gcm/send"
@@ -50,7 +52,6 @@ module Push
         def open_http(host, port)
           http = Net::HTTP.new(host, port)
           http.use_ssl = true
-          http.verify_mode = OpenSSL::SSL::VERIFY_NONE
           return http
         end
 
@@ -59,15 +60,48 @@ module Push
                      "Content-type" => "application/json",
                      "Content-length" => "#{data.length}" }
           uri = URI.parse(PUSH_URL)
+          post(uri, data, headers)
+        end
 
-          # Timeout on the http connection is 5 minutes, reconnect after 5 minutes
-          if @last_use + IDLE_PERIOD < Time.now
-            @connection.finish
-            @connection.start
+        def post(uri, data, headers)
+          reconnect_idle if idle_period_exceeded?
+
+          retry_count = 0
+
+          begin
+            response = @connection.post(uri.path, data, headers)
+            @last_use = Time.now
+          rescue EOFError, Errno::ECONNRESET, Timeout::Error => e
+            retry_count += 1
+
+            Push::Daemon.logger.error("[#{@name}] Lost connection to #{PUSH_URL} (#{e.class.name}), reconnecting ##{retry_count}...")
+
+            if retry_count <= 3
+              reconnect
+              sleep 1
+              retry
+            else
+              raise ConnectionError, "#{@name} tried #{retry_count-1} times to reconnect but failed (#{e.class.name})."
+            end
           end
-          @last_use = Time.now
 
-          @connection.post(uri.path, data, headers)
+          response
+        end
+
+        def idle_period_exceeded?
+          # Timeout on the http connection is 5 minutes, reconnect after 5 minutes
+          @last_use + IDLE_PERIOD < Time.now
+        end
+
+        def reconnect_idle
+          Push::Daemon.logger.info("[#{@name}] Idle period exceeded, reconnecting...")
+          reconnect
+        end
+
+        def reconnect
+          @connection.finish
+          @last_use = Time.now
+          @connection.start
         end
       end
     end

data/lib/push/message_gcm.rb

@@ -26,7 +26,6 @@ module Push
 
     def check_for_error(connection)
       response = connection.response
-
       if response.code.eql? "200"
         hsh = MultiJson.load(response.body)
         if hsh["failure"] == 1
@@ -41,10 +40,10 @@ module Push
               Push::FeedbackGcm.create!(:app => connection.provider.configuration[:name], :failed_at => Time.now,
                 :device => device, :follow_up => 'delete')
             end
-          else
-            Push::Daemon.logger.error("[#{connection.name}] Error received.")
-            raise Push::DeliveryError.new(response.code, id, msg, "GCM")
           end
+
+          Push::Daemon.logger.error("[#{connection.name}] Error received.")
+          raise Push::DeliveryError.new(response.code, id, msg, "GCM")
         elsif hsh["canonical_ids"] == 1
           # success, but update device token
           update_to = hsh["results"][0]["registration_id"]
@@ -55,7 +54,7 @@ module Push
         end
       else
         Push::Daemon.logger.error("[#{connection.name}] Error received.")
-        raise Push::DeliveryError.new(response.code, id, response.body, "GCM")
+        raise Push::DeliveryError.new(response.code, id, response.message, "GCM")
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: push-gcm
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-19 00:00:00.000000000 Z
+date: 2012-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &70179723946700 !ruby/object:Gem::Requirement
+  requirement: &70221520088900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70179723946700
+  version_requirements: *70221520088900
 - !ruby/object:Gem::Dependency
   name: push-core
-  requirement: &70179723945680 !ruby/object:Gem::Requirement
+  requirement: &70221520087640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70179723945680
+  version_requirements: *70221520087640
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70179723945080 !ruby/object:Gem::Requirement
+  requirement: &70221520086880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70179723945080
+  version_requirements: *70221520086880
 description: GCM support for the modular push daemon.
 email:
 - tom@tnux.net