rhoconnect 4.0.3 → 4.0.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NzEyZTRlNDkzNWNjZTBiNTlkNTFhNWQ0YzgwZDAwY2RmODQzZjg3NA==
+    MDBhM2NiYzg5N2I5NzRmNjg1ODk3ZjM4MDI5ZmFmN2IyOTJiOWZjNQ==
   data.tar.gz: !binary |-
-    YmNhNjQyNDZmZDNiY2M0MTViMzI1N2FlZTBmOGQ0NjYzOWQ5NjExYQ==
+    YTRlNDA1ZmIzZDQ3OTZkMWQ5MmQyOTlmNDdhYjM0NThhNDgzY2U1NA==
 SHA512:
   metadata.gz: !binary |-
-    MzFlOWMyZGM5N2M5Y2M0ZDhhZmJjNGE3NmExN2E0NzIwOGNhZGIwOGIxZjU5
-    ZjFjZjE1YTJhMjQ5NDFkODlmMDljZjI1NGFjMThmMzA0MWQyZGE0ZmNkNmMz
-    YjA5Y2EyMTliZjRhZjE0ZjIxYmJkOGRkMjk3NzI0N2VhOTNiNjQ=
+    ZDhkMjVlMjI0NDk3N2I4YzY5M2ExMzA0MmNjMzNkZTU0NGIyMmU2YzVkYWM3
+    YjdlZDIwMmFiZjM2OTU4MDc0ZjIzNGExYjdkN2MxMmE1ZDhhMDY4OTYwOTAx
+    OWExZGZkY2NkM2QwODFmYTgxYWY5NGUyMWU4NzZiMjIzY2U5N2U=
   data.tar.gz: !binary |-
-    OTJlYTUzMDRlZDM3YzAzZmQzZTkzMzdiODllZWE0MTJjNjZjMjk2NGU2M2Uw
-    MTY1NGY1NDQyODA0NWVhZTFhNjM0NDk4ZWM2ZDEwNzE2YjhiMjNiNTkzNDFh
-    ODhiNmI0MzU0NGYyMGE1NGM4MmIzOWZiZTYxMmQxMDIxZjgxNWM=
+    ZWVkODNmMTVlYTc2ODhjM2JmN2JkNzVkY2ZjMDAyMzdjZjg3OTE2M2Q2OTk2
+    NzY3OTZjODQ2Njk3N2QxY2Y5OWJlMDMxODczYjRlYWJhYTU4NDgyMDU0NTEz
+    MzM2NDFhNjdhY2Y0NWVjZmNmNjdjNDA0ZDAwNDcyOTliZWM2ZjY=

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 4.0.4 (2014-03-26)
+* 68317450 - 'query' SourceJob infinite loop
+
 ## 4.0.3 (2014-03-07)
 * Fixing redis connection string for windows (backport from master)
 * #66902274: CUD operations alter user between login-cud-logoff sequence

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rhoconnect (4.0.3)
+    rhoconnect (4.0.4)
       bundler (~> 1.0)
       connection_pool (~> 1.0.0)
       json (~> 1.7.7)
@@ -18,7 +18,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.3.5)
+    addressable (2.3.6)
     arr-pm (0.0.9)
       cabin (> 0)
     async-rack (0.5.1)
@@ -30,7 +30,7 @@ GEM
     backports (3.6.0)
     builder (3.2.2)
     cabin (0.6.1)
-    childprocess (0.5.1)
+    childprocess (0.5.2)
       ffi (~> 1.0, >= 1.0.11)
     clamp (0.6.3)
     coffee-script (2.2.0)
@@ -90,9 +90,9 @@ GEM
       rainbow
       sprockets (~> 2)
     json (1.7.7)
-    mime-types (2.1)
+    mime-types (2.2)
     mono_logger (1.1.0)
-    multi_json (1.9.0)
+    multi_json (1.9.2)
     net-scp (1.1.2)
       net-ssh (>= 2.6.5)
     net-ssh (2.8.0)
@@ -143,7 +143,7 @@ GEM
       rack (~> 1.4)
       rack-protection (~> 1.4)
       tilt (~> 1.3, >= 1.3.4)
-    sprockets (2.11.0)
+    sprockets (2.12.0)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)

data/lib/rhoconnect/bulk_data/bulk_data.rb

@@ -34,7 +34,7 @@ module Rhoconnect
         if s
           rh = lambda { @model.query(params[:query])}
           model = Rhoconnect::Model::Base.create(s)
-          Rhoconnect::Handler::Query::Engine.new(model, rh, {}).do_sync
+          Rhoconnect::Handler::Query::Engine.new(model, rh, {}).run_query
           s.clone(:md, s.docname(:md_copy)) unless s.sync_type.to_sym == :bulk_sync_only
         end
       end

data/lib/rhoconnect/handler/query/engine.rb

@@ -26,22 +26,28 @@ module Rhoconnect
           if source.query_queue or source.queue
             query_res = async(:query, source.query_queue || source.queue, params[:query])
           else
-            source.if_need_refresh do
-              Rhoconnect::Stats::Record.update("source:query:#{source.name}") do
-                if auth_method('login')
-                  query_res = run_query
-                  auth_method('logoff')
-                end
-                # re-wind refresh time in case of error
-                query_failure = source.exists?(:errors)
-                source.rewind_refresh_time(query_failure)
+            query_res = run_query
+          end
+          query_res
+        end
+
+        def run_query
+          query_res = nil
+          source.if_need_refresh do
+            Rhoconnect::Stats::Record.update("source:query:#{source.name}") do
+              if auth_method('login')
+                query_res = _execute_query
+                auth_method('logoff')
               end
+              # re-wind refresh time in case of error
+              query_failure = source.exists?(:errors)
+              source.rewind_refresh_time(query_failure)
             end
           end
           query_res
         end
 
-        def run_query
+        def _execute_query
           errordoc = nil
           docobj = nil
           result = nil

data/lib/rhoconnect/jobs/source_job.rb

@@ -13,7 +13,7 @@ module Rhoconnect
         handler_sync = lambda { @model.query(params[:query])}
         @model = Rhoconnect::Model::Base.create(source)
         source_sync = Rhoconnect::Handler::Query::Engine.new(@model, handler_sync, params)
-        source_sync.do_sync
+        source_sync.run_query
       when :cud
         handler_cud = lambda { @model.send params[:operation].to_sym, params["#{params[:operation]}_object".to_sym] }
         @model = Rhoconnect::Model::Base.create(source)

data/lib/rhoconnect/version.rb

@@ -1,3 +1,3 @@
 module Rhoconnect
-  VERSION = '4.0.3'
+  VERSION = '4.0.4'
 end

data/spec/jobs/source_job_spec.rb

@@ -4,6 +4,8 @@ describe "SourceJob" do
   it_behaves_like "SharedRhoconnectHelper", :rhoconnect_data => true do
     before(:each) do
       @s = Source.load(@s_fields[:name],@s_params)
+      @s.query_queue = 'query'
+      @s.cud_queue = 'cud'
     end
     
     it "should perform process_query" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rhoconnect
 version: !ruby/object:Gem::Version
-  version: 4.0.3
+  version: 4.0.4
 platform: ruby
 authors:
 - Rhomobile
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-11 00:00:00.000000000 Z
+date: 2014-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler