dor-fetcher 1.1.2 → 1.1.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZDIzMmIyMTY5NzNjZGQzYWExMzhmYWFhNDY0ZmVkZjE3ZGFkNGIwMw==
+    Y2MyNDEzMjAxNjFjZWZmYzNlNmExN2Y4NzI3MTM0Njc3ODFlODJlOA==
   data.tar.gz: !binary |-
-    YzU5NDYyYTA2ZTVjOTMwNDBhYjBiNjg5YzNiYzM4MzIyZDdmOGUwNA==
+    Y2FhYzU1Zjk0ZTdlYjNiZTMyZDVhYjJiMGRhZmY0YzIyMTFkODBlMA==
 SHA512:
   metadata.gz: !binary |-
-    MDYzZGFmOWYzZGY5Mjk2ZTM5ZjU5ZDNhNGI1YTBjNGEzZWEzZDdjOTBiODgx
-    MzBkOTdiYmE2N2ZlNDQxOWMyODg0MTI5OWUzZjc5MjEzYTE0NjliNGZhYzg1
-    ZGM3MGRiY2Q5Mzg3YmUyOTIzNDEyNDRlM2E1ZDkxZTViZTc1M2M=
+    YWE3YjdjMmY2YzdiYTc0YmNiYzhkNTNlMjdiOGQ1ODdiNWE3MDgwYjE1Nzk2
+    ZmM0OWEwNjk0Yzk0MDI4ODk5YmY0ZjNjMTcxNjljNDExZjJjYTQ0ODc4NGMz
+    ZjE3MjVhNTdiZTdkOGQ3MThhMjRkMzBiMjQxM2Y3NzYwOTk3NWM=
   data.tar.gz: !binary |-
-    MmY0NzBlOTcyMWZjM2Y4NzJiZGExNmI0NWFkOTkzM2Y2OGI2OTZjMmYzOTE0
-    MWJmYWY2M2VmNDNmNjI4MGE1Njk2NmYxNzdiNGY2NWViNWZlM2NmZDEwZjc5
-    YjZmNjZlNDk4MWQwOGRlYzk2NjhhYmEzN2MzMjUzMDUwOTVmMjE=
+    YTk0ZjZmNTIzN2EzYmIyZmJmMjJhMTgxMWI0OWNhOTE4MDQ4ZjYwZmIwYmZl
+    Zjk3ZDNkMzQ5MDBmMDYzNzk0NjBlYTM3N2NiNjMyNDQyOTQyNDcyYTQ3Mzdk
+    ZjViY2E2YTdiZWM5YzVhNmFmZDJlYzkyODBlOWYxZWM5ZjZlZDI=

data/lib/dor-fetcher.rb

@@ -19,21 +19,24 @@ module DorFetcher
     def initialize options = {}
       #TODO: Check for a well formed URL and a 200 from the destination before just accepting this
       @service_url = options[:service_url] || @@default_service_url
-      @site = RestClient::Resource.new(@service_url) 
+      @site = RestClient::Resource.new(@service_url, :timeout => nil, :open_timeout => nil)
 
       if not options[:skip_heartbeat]
-        raise "DorFetcher::Client Error! No response from #{@service_url}" if not self.is_alive
+        raise "DorFetcher::Client Error! No response from #{@service_url}" if not self.is_alive?
       end
-      
-      
-      
+    end
+    
+    # Return service info (rails env, version deployed, last restart and last deploy)
+    #@return [hash] Hash containing service info
+    def service_info
+      resp = @site['about/version.json'].get
+      return JSON[resp]
     end
     
     #Check to see if the dor-fetcher-service is responding to requests, this is a basic heart beat checker
     #@return [Boolean] True for a service that responds, False for a service that does not.
-    def is_alive
+    def is_alive?
       resp = @site.get
-      #Since dor-fetcher-service uses the is_alive gem, the main page should simply have okay on it
       return 200.eql?(resp.code) && "ok".eql?(resp) 
     end
     

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dor-fetcher
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.4
 platform: ruby
 authors:
 - Carrick Rogers
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-11 00:00:00.000000000 Z
+date: 2014-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec