istox 0.1.130.pre.1 → 0.1.130.pre.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d5d4e7c1ed144ded864cc61b37c4f14c9e480e4d99fed5e9e11d6d6f67b68b62
-  data.tar.gz: 6a86ae7f05208885dff3091ec4dd298a852bb01159562acc2b77832672e91bc4
+  metadata.gz: 55b4aaaa8ab83cb0c061db6c94226363c0d8e6f781f94a2caa3c689454a1274d
+  data.tar.gz: 7e0daeaa9c8d49e66baa839ab2eebf08f7491978aeb4119541a768986ff77f37
 SHA512:
-  metadata.gz: 7c02c224fa860aba3fe707b02c200a49c79b473e56785c82887e533a4519da8955767b7d7a71de24460667409887ff89e89a3ce3f190b743677b2a99b532f020
-  data.tar.gz: 8ac8782cd41179f94b5eb9fdd579aecb12f8e56367b92305046996812065165a00fcabd5928765ebe5ce691b024fe9364b0e0831fa89cb728ca36dac2439b225
+  metadata.gz: 9a94d15db073a929c19b0780af1a83414a0423cc6ab5e88957807ce138434b6fc10a0c0dd349326f20ac6287f8dfc02033344dd380524483a32981d673a50166
+  data.tar.gz: 987b98782522ef8ca7231e128ffcdcb8100cc20a3a22248c1d12859ba3049df5ae97264a81f87becceee16eb2eacebd0a7d35827b604869abedadfa9b7fbc186

data/.idea/istox-gem.iml

@@ -532,36 +532,36 @@
       </library>
     </orderEntry>
     <orderEntry type="module-library">
-      <library name="faraday (vbundled(1.0.0)) [path][gem]" type="rubylib">
+      <library name="faraday (vbundled(0.17.3)) [path][gem]" type="rubylib">
         <properties>
           <option name="version" value="4" />
         </properties>
         <CLASSES>
-          <root url="file://$MODULE_DIR$/vendor/bundle/ruby/2.5.0/gems/faraday-1.0.0/lib" />
-          <root url="file://$MODULE_DIR$/vendor/bundle/ruby/2.5.0/gems/faraday-1.0.0/spec" />
-          <root url="file://$MODULE_DIR$/vendor/bundle/ruby/2.5.0/gems/faraday-1.0.0/examples" />
+          <root url="file://$MODULE_DIR$/vendor/bundle/ruby/2.5.0/gems/faraday-0.17.3/lib" />
+          <root url="file://$MODULE_DIR$/vendor/bundle/ruby/2.5.0/gems/faraday-0.17.3/spec" />
+          <root url="file://$MODULE_DIR$/vendor/bundle/ruby/2.5.0/gems/faraday-0.17.3/test" />
         </CLASSES>
         <SOURCES>
-          <root url="file://$MODULE_DIR$/vendor/bundle/ruby/2.5.0/gems/faraday-1.0.0/lib" />
-          <root url="file://$MODULE_DIR$/vendor/bundle/ruby/2.5.0/gems/faraday-1.0.0/spec" />
-          <root url="file://$MODULE_DIR$/vendor/bundle/ruby/2.5.0/gems/faraday-1.0.0/examples" />
+          <root url="file://$MODULE_DIR$/vendor/bundle/ruby/2.5.0/gems/faraday-0.17.3/lib" />
+          <root url="file://$MODULE_DIR$/vendor/bundle/ruby/2.5.0/gems/faraday-0.17.3/spec" />
+          <root url="file://$MODULE_DIR$/vendor/bundle/ruby/2.5.0/gems/faraday-0.17.3/test" />
         </SOURCES>
         <excluded>
-          <root url="file://$MODULE_DIR$/vendor/bundle/ruby/2.5.0/gems/faraday-1.0.0/spec" />
-          <root url="file://$MODULE_DIR$/vendor/bundle/ruby/2.5.0/gems/faraday-1.0.0/examples" />
+          <root url="file://$MODULE_DIR$/vendor/bundle/ruby/2.5.0/gems/faraday-0.17.3/spec" />
+          <root url="file://$MODULE_DIR$/vendor/bundle/ruby/2.5.0/gems/faraday-0.17.3/test" />
         </excluded>
       </library>
     </orderEntry>
     <orderEntry type="module-library">
-      <library name="faraday_middleware (vbundled(1.0.0.rc1)) [path][gem]" type="rubylib">
+      <library name="faraday_middleware (vbundled(0.14.0)) [path][gem]" type="rubylib">
         <properties>
           <option name="version" value="4" />
         </properties>
         <CLASSES>
-          <root url="file://$MODULE_DIR$/vendor/bundle/ruby/2.5.0/gems/faraday_middleware-1.0.0.rc1/lib" />
+          <root url="file://$MODULE_DIR$/vendor/bundle/ruby/2.5.0/gems/faraday_middleware-0.14.0/lib" />
         </CLASSES>
         <SOURCES>
-          <root url="file://$MODULE_DIR$/vendor/bundle/ruby/2.5.0/gems/faraday_middleware-1.0.0.rc1/lib" />
+          <root url="file://$MODULE_DIR$/vendor/bundle/ruby/2.5.0/gems/faraday_middleware-0.14.0/lib" />
         </SOURCES>
       </library>
     </orderEntry>
@@ -1391,24 +1391,6 @@
         </excluded>
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
-      <library name="redlock (vbundled(1.2.0)) [path][gem]" type="rubylib">
-        <properties>
-          <option name="version" value="4" />
-        </properties>
-        <CLASSES>
-          <root url="file://$MODULE_DIR$/vendor/bundle/ruby/2.5.0/gems/redlock-1.2.0/lib" />
-          <root url="file://$MODULE_DIR$/vendor/bundle/ruby/2.5.0/gems/redlock-1.2.0/spec" />
-        </CLASSES>
-        <SOURCES>
-          <root url="file://$MODULE_DIR$/vendor/bundle/ruby/2.5.0/gems/redlock-1.2.0/lib" />
-          <root url="file://$MODULE_DIR$/vendor/bundle/ruby/2.5.0/gems/redlock-1.2.0/spec" />
-        </SOURCES>
-        <excluded>
-          <root url="file://$MODULE_DIR$/vendor/bundle/ruby/2.5.0/gems/redlock-1.2.0/spec" />
-        </excluded>
-      </library>
-    </orderEntry>
     <orderEntry type="module-library">
       <library name="rspec (vbundled(3.8.0)) [path][gem]" type="rubylib">
         <properties>

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    istox (0.1.129)
+    istox (0.1.130.pre.2)
       awesome_print
       binding_of_caller
       bunny (>= 2.12.0)
@@ -15,7 +15,6 @@ PATH
       redis (>= 2.0.0)
       redis-namespace (>= 1.0.0)
       redis-rails (~> 5.0.2)
-      redlock (~> 1.2.0)
       vault (~> 0.1)
 
 GEM
@@ -91,14 +90,14 @@ GEM
       i18n (~> 0.5)
     fakeredis (0.7.0)
       redis (>= 3.2, < 5.0)
-    faraday (1.0.0)
+    faraday (0.17.3)
       multipart-post (>= 1.2, < 3)
-    faraday_middleware (1.0.0.rc1)
-      faraday (~> 1.0)
+    faraday_middleware (0.14.0)
+      faraday (>= 0.7.4, < 1.0)
     ffi (1.12.2)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
-    google-protobuf (3.11.4)
+    google-protobuf (3.11.4-universal-darwin)
     googleapis-common-protos-types (1.0.4)
       google-protobuf (~> 3.0)
     graphlient (0.3.7)
@@ -109,7 +108,7 @@ GEM
     graphql-client (0.16.0)
       activesupport (>= 3.0)
       graphql (~> 1.8)
-    grpc (1.27.0)
+    grpc (1.27.0-universal-darwin)
       google-protobuf (~> 3.11)
       googleapis-common-protos-types (~> 1.0)
     grpc-tools (1.27.0)
@@ -202,8 +201,6 @@ GEM
       redis-store (>= 1.2, < 2)
     redis-store (1.8.2)
       redis (>= 4, < 5)
-    redlock (1.2.0)
-      redis (>= 3.0.0, < 5.0)
     rspec (3.8.0)
       rspec-core (~> 3.8.0)
       rspec-expectations (~> 3.8.0)

data/istox.gemspec

@@ -44,7 +44,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'redis', '>= 2.0.0'
   spec.add_dependency 'redis-namespace', '>= 1.0.0'
   spec.add_dependency 'vault', '~> 0.1'
-  spec.add_dependency 'redlock', '~>1.2.0'
   spec.add_development_dependency 'bullet', '~> 5.7.5'
   spec.add_development_dependency 'bundler', '~> 1.16'
   spec.add_development_dependency 'database_cleaner', '~> 1.6.0'

data/lib/istox/helpers/bunny_boot.rb

@@ -29,7 +29,6 @@ module Istox
 
         # Put channel in confirmation mode
         ch.confirm_select if opts[:confirm]
-        log.debug "channel unconfirmed_set is #{ch.unconfirmed_set}"
 
         ch
       end
@@ -137,6 +136,12 @@ module Istox
         nil
       end
 
+      def queue_worker_param_format(consumer_key)
+        queue_config_from_consumer_key!(consumer_key)['worker_param_format'] || 'open_struct'
+      rescue
+        nil
+      end
+
       def queue_exclusive(consumer_key)
         queue_config_from_consumer_key!(consumer_key)['exclusive'] || false
       rescue

data/lib/istox/helpers/publisher.rb

@@ -13,7 +13,7 @@ module Istox
       #   publish_confirm: true/false
       # }
       def publish(exchange: nil, routing_key: nil, binding:nil, binding_suffix:nil, message:, options: {})
-
+        log.debug '************************* Publish ************************'
         if exchange.nil? && routing_key.nil?
           raise 'Exchange and routing key cannot be nil at the same time.' if binding.nil?
           exchange = ::Istox::BunnyBoot.binding_exchange_id(binding)
@@ -197,6 +197,7 @@ module Istox
       end
 
       def do_publish(ex, options = {}, message)
+        log.debug '************** do_publish ***************'
         eid = ::Istox::BunnyBoot.eid ex
         ch = ex.channel
         channel_id = ch.id
@@ -216,6 +217,7 @@ module Istox
         end
 
         if confirm && mode == 0
+          log.debug '************** Confirm && mode == 0 ***************'
           success = ex.channel.wait_for_confirms
           if success
             # ::Istox::BunnyBoot.del_tracker_on_channel channel_id
@@ -231,6 +233,7 @@ module Istox
             ret
           end
         end
+        log.debug '******************* End of do_publish ******************'
       rescue Bunny::ConnectionClosedError => e
         log.debug "Publish fails due to #{e}"
         sleep 1

data/lib/istox/helpers/subscriber.rb

@@ -142,14 +142,13 @@ module Istox
           retry_limit = ::Istox::BunnyBoot.queue_retry_limit consumer_key
           unless metadata[:priority] && retry_limit != -1 && metadata[:priority] >= retry_limit
             processing_paylod = JSON.parse(payload)
-            payload_object = ::Istox::CommonHelper.to_open_struct(processing_paylod)
-
-            log.info "Processing in consumer: #{klass}, paylod: #{payload_object.to_h.inspect}"
+            processing_paylod = ::Istox::CommonHelper.to_open_struct(processing_paylod) if ::Istox::BunnyBoot.queue_worker_param_format(consumer_key) == 'open_struct'
+            log.info "Processing in consumer: #{klass}, paylod: #{processing_paylod.to_h.inspect}"
 
             if @workers[ruby_class].nil?
-              result = block.call(payload_object, metadata, delivery_info) unless block.nil?
+              result = block.call(processing_paylod, metadata, delivery_info) unless block.nil?
             else
-              result = @workers[ruby_class].process(payload_object, metadata, delivery_info)
+              result = @workers[ruby_class].process(processing_paylod, metadata, delivery_info)
             end
           end
           # active_channel.ack(delivery_info.delivery_tag) if manual_ack

data/lib/istox/version.rb

@@ -1,3 +1,3 @@
 module Istox
-  VERSION = '0.1.130.pre.1'.freeze
+  VERSION = '0.1.130.pre.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: istox
 version: !ruby/object:Gem::Version
-  version: 0.1.130.pre.1
+  version: 0.1.130.pre.2
 platform: ruby
 authors:
 - Siong Leng
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-17 00:00:00.000000000 Z
+date: 2020-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print
@@ -206,20 +206,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
-- !ruby/object:Gem::Dependency
-  name: redlock
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.2.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: bullet
   requirement: !ruby/object:Gem::Requirement