libgss 0.6.0 → 0.6.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YzVkZDBjNDQzMDg1OWY2NGQ4ODBlYmJjYzI4Yzg0MTNmNWMwYzMxYQ==
+    NzVlZmVlNzIyZWVhNThiNTM4MGQxYTEyMzM0MWUyYjY1MDc4NTMzNw==
   data.tar.gz: !binary |-
-    YWY3YzczZmM1M2ZiNGE5NjY3ODJiZjYwYzUzZWQxYTZlMWM2MGMzZA==
+    YzhmZmVmZGI0YTdmOWM0NDY5NDk5OWU5ZGIwMWQyMzg1ZDAzM2VmMg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MGQzOWUzMjA4Y2ZlMjIyZGM0ZWI0Yjg0NzFiNDMyODg0YTlkNzExYzhiZGYz
-    MWU4M2QxNjE4YzVkODY2MzYwNDg1ZDk5NGRkNWE4MzNjZTc5MmRlYjBlNTYx
-    Mjc4YWI2ZTlhNzJlYTA5ZmQ1NTk2ZGVjMTlhMDgzYWYyZGYxMTA=
+    ZTFkYmE5ZDA0ZThjZmY3MWFjMzJmODYxNjU1MGYzMDk3YTUyOGVhNDRiYWI2
+    NTY4NDhhY2NhZWMxYzZkY2RmNDk1NmM0ZTY1MjZjZDlhMWRkYjU4NGJjYWZk
+    OTg1YTJjMmQxZmY4YTdkMGI4ZDYzZTRjMzA5ZjRiMmU4NDYxOTU=
   data.tar.gz: !binary |-
-    MDkxOWQ2NjBjODNkODNhYjM0YTg1ODQzYmY2OWM0MWMzZTBhODdmY2U5YWZi
-    YTNkNzMwZDhjNjg4YjgxNzA2MWJhMGQ4NWI2OGY4MTEyMzQ2ODM0NjY4OGZj
-    M2EyMmMzNjY0ZjQxZWM5ZWY1ZjEyMzc4NThhOWViY2QzYmFiM2M=
+    NjcwMWEyNWU4ZDg3NDljNDMyYmI5NzhjNDRkNzVkZDRhNWM4M2NmNjkwY2Nl
+    YjE0NTI1ZWU3MDg2ZDY4YmEyYjUyYjc4MmE5MDU1MThhMTUwOThiYzIxOGVk
+    ZTVmMjNlN2QxYmQwMGMxMTFmNmZkYWYwMjEyMWI3Zjk4NDY5MGU=

data/lib/libgss.rb

@@ -16,4 +16,23 @@ module Libgss
   end
 
   self.use_oauth_gem = (ENV["USE_OAUTH_GEM"] =~ /\Atrue\Z|\Aon\Z/i)
+
+  MAX_RETRY_COUNT = (ENV["LIBGSS_MAX_RETRY_COUNT"] || 10).to_i
+
+  class << self
+
+    def with_retry(name)
+      retry_count = 0
+      begin
+        return yield
+      rescue OpenSSL::SSL::SSLError => e
+        $stderr.puts("retrying #{name} [#{e.class.name}] #{e.message}")
+        sleep(0.2)
+        retry_count += 1
+        retry if retry_count <= MAX_RETRY_COUNT
+        raise e
+      end
+    end
+
+  end
 end

data/lib/libgss/action_request.rb

@@ -52,7 +52,9 @@ module Libgss
 
     # アクション群を実行するために実際にHTTPリクエストを送信します。
     def send_request(&callback)
-      res = @httpclient.post(action_url, {"inputs" => @actions.map(&:to_hash)}.to_json, req_headers)
+      res = Libgss.with_retry("action_request") do
+        @httpclient.post(action_url, {"inputs" => @actions.map(&:to_hash)}.to_json, req_headers)
+      end
       case res.code.to_i
       when 200..299 then # OK
       else

data/lib/libgss/network.rb

@@ -91,24 +91,17 @@ module Libgss
     # @option options [String]  :platform 接続先のGSSサーバの認証のプラットフォーム。デフォルトは"fontana"。
     # @return [Boolean] ログインに成功した場合はtrue、失敗した場合はfalse
     def login(extra = {})
-      retry_count = 0
-      begin
       attrs = { "player[id]" => player_id }
       extra.each{|k, v| attrs[ "player[#{k}]" ] = v }
-      res = @httpclient.post(login_url, attrs, req_headers)
+      res = Libgss.with_retry("login") do
+        @httpclient.post(login_url, attrs, req_headers)
+      end
       process_json_response(res) do |obj|
         @player_id ||= obj["player_id"]
         @auth_token = obj["auth_token"]
         @signature_key = obj["signature_key"]
         !!@auth_token && !!@signature_key
       end
-      rescue OpenSSL::SSL::SSLError => e
-        $stderr.puts("retrying login [#{e.class.name}] #{e.message}")
-        sleep(0.2)
-        retry_count += 1
-        retry if retry_count > 3
-        raise e
-      end
     end
 
     def ignore_signature_key?

data/lib/libgss/version.rb

@@ -1,3 +1,3 @@
 module Libgss
-  VERSION = "0.6.0"
+  VERSION = "0.6.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: libgss
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - akima
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-23 00:00:00.000000000 Z
+date: 2013-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler