push-c2dm 1.0.0 → 1.0.1

data/lib/push-c2dm/version.rb

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

data/lib/push/daemon/c2dm_support/connection_c2dm.rb

@@ -1,10 +1,13 @@
 module Push
   module Daemon
     module C2dmSupport
+      class ConnectionError < StandardError; end
+
       class ConnectionC2dm
         attr_reader :response, :name, :provider
         AUTH_URL = "https://www.google.com/accounts/ClientLogin"
         PUSH_URL = "https://android.apis.google.com/c2dm/send"
+        IDLE_PERIOD = 5.minutes
 
         def initialize(provider, i)
           @provider = provider
@@ -74,15 +77,48 @@ module Push
                      "Content-type" => "application/x-www-form-urlencoded",
                      "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 + 5.minutes < 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_c2dm.rb

@@ -44,15 +44,16 @@ module Push
         # not be used anymore
         if ["InvalidRegistration", "NotRegistered"].index(error_type)
           with_database_reconnect_and_retry(connection.name) do
-            Push::FeedbackC2dm.create!(:app => connection.provider.configuration[:name], :failed_at => Time.now, :device => device, :follow_up => 'delete')
+            Push::FeedbackC2dm.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, error_type, "C2DM")
         end
+
+        Push::Daemon.logger.error("[#{connection.name}] Error received.")
+        raise Push::DeliveryError.new(response.code, id, error_type, "C2DM")
       elsif !response.code.eql? "200"
         Push::Daemon.logger.error("[#{connection.name}] Error received.")
-        raise Push::DeliveryError.new(response.code, id, response.description, "C2DM")
+        raise Push::DeliveryError.new(response.code, id, response.message, "C2DM")
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: push-c2dm
 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: &70324549334240 !ruby/object:Gem::Requirement
+  requirement: &70146043588440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70324549334240
+  version_requirements: *70146043588440
 - !ruby/object:Gem::Dependency
   name: push-core
-  requirement: &70324549333160 !ruby/object:Gem::Requirement
+  requirement: &70146043587200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70324549333160
+  version_requirements: *70146043587200
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70324549332620 !ruby/object:Gem::Requirement
+  requirement: &70146043586440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70324549332620
+  version_requirements: *70146043586440
 description: C2DM support for the modular push daemon.
 email:
 - tom@tnux.net