istox 0.1.130.pre.3 → 0.1.130

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    istox (0.1.130.pre.2)
+    istox (0.1.130)
       awesome_print
       binding_of_caller
       bunny (>= 2.12.0)
@@ -97,7 +97,7 @@ GEM
     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)
@@ -108,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)

data/lib/istox/helpers/bunny_boot.rb

@@ -118,7 +118,6 @@ module Istox
 
         name = "#{prefix}#{delimiter}#{name}" unless prefix.nil?
         name = "#{name}#{delimiter}#{suffix}" unless suffix.nil?
-        log.debug "name is #{name}"
         name
       rescue
         nil
@@ -281,9 +280,9 @@ module Istox
         # But each retry, there is new delivery_tag that should be updated
         id = "#{channel_id.to_s}:#{delivery_tag.to_s}"
 
-        ::Istox::RedisBoot.sets("#{id}:payload", payload.to_s, 4)
+        ::Istox::RedisBoot.sets("#{id}:payload", JSON.dump(payload), 4)
         ::Istox::RedisBoot.sets("#{id}:eid", eid.to_s, 4)
-        ::Istox::RedisBoot.sets("#{id}:options", options.to_s, 4)
+        ::Istox::RedisBoot.sets("#{id}:options", JSON.dump(options), 4)
       end
 
       def find_tracker_on_channel(channel_id, delivery_tag, key)
@@ -320,6 +319,10 @@ module Istox
         ex.type
       end
 
+      def cacheMsg(suffix, msg)
+        ::Istox::RedisBoot.sets("drop_msg_#{suffix}", JSON.dump(msg), 7)
+      end
+
       private
 
       def data

data/lib/istox/helpers/messaging.rb

@@ -26,9 +26,6 @@ module Istox
               subject: subject || 'Message from iSTOX',
               body: content
             }
-          },
-          options: {
-            confirm: 0
           }
         )
       end
@@ -54,9 +51,6 @@ module Istox
               template_name: template_name,
               template_data_arr_json: template_data_arr.to_json
             }
-          },
-          options: {
-              confirm: 0
           }
         )
       end
@@ -92,9 +86,6 @@ module Istox
               body: content,
               attachments_json: attachments&.to_json
             }
-          },
-          options: {
-            confirm: 0
           }
         )
       end
@@ -126,9 +117,6 @@ module Istox
               template_data_arr_json: template_data_arr.to_json,
               attachments_json: attachments&.to_json
             }
-          },
-          options: {
-            confirm: 0
           }
         )
       end

data/lib/istox/helpers/publisher.rb

@@ -87,7 +87,7 @@ module Istox
                 ::Istox::BunnyBoot.del_tracker_on_channel @channel[threadId]['confirm-1'].id
               else
                 @channel[threadId]['confirm-1'].nacked_set.each do |n|
-                  log.debug "[Async #{threadId}] Confirm mode UnAcked Delivery Tag: #{n}"
+                  log.debug("Publish Error[Async #{threadId}]: UNACK delivery tag is #{n}, republish message")
                   eid = ::Istox::BunnyBoot.find_tracker_on_channel @channel[threadId]['confirm-1'].id, n, 'eid'
                   payload = ::Istox::BunnyBoot.find_tracker_on_channel @channel[threadId]['confirm-1'].id, n, 'payload'
                   payload = JSON.dump payload unless payload.nil?
@@ -218,17 +218,15 @@ module Istox
         if confirm && mode == 0
           success = ex.channel.wait_for_confirms
           if success
-            # ::Istox::BunnyBoot.del_tracker_on_channel channel_id
-            0
+            ::Istox::BunnyBoot.del_tracker_on_channel channel_id
           else
-            ret = []
             ex.channel.nacked_set.each do |n|
-              log.debug("UnAck delivery tag is #{n}")
+              log.debug("Publish Error: UNACK delivery tag is #{n}, republish message")
               options = ::Istox::BunnyBoot.find_tracker_on_channel(channel_id, n, 'options')
-              options = JSON.dump options
-              ret << {delivery_tag: n, message_id: options[:message_id]}
+              options = JSON.parse(options, :symbolize_names => true)
+              options[:delivery_tag] = n
+              do_publish(ex, options, message)
             end
-            ret
           end
         end
       rescue Bunny::ConnectionClosedError => e
@@ -236,7 +234,7 @@ module Istox
         sleep 1
         do_publish(ex,options,message)
       rescue => e
-        log.debug "Timeout error happens #{e}"
+        log.debug "Error happens: #{e}"
       end
     end
   end

data/lib/istox/helpers/subscriber.rb

@@ -76,7 +76,7 @@ module Istox
 
           # Bind queue to exchange
           queue_options = {}
-          queue_options[:routing_key] = ::Istox::BunnyBoot.queue_routing_key consumer_key if exchange_type == 'direct' || exchange_type == 'topic'
+          queue_options[:routing_key] = queue_name if exchange_type == 'direct' || exchange_type == 'topic'
           queue.bind exchange, queue_options
         end
 
@@ -88,7 +88,7 @@ module Istox
           end
           retry_queue = active_channel.queue("#{queue_name}.retry", arguments: {
               'x-dead-letter-exchange': letter_exchange,
-              'x-dead-letter-routing-key': ::Istox::BunnyBoot.queue_routing_key(consumer_key),
+              'x-dead-letter-routing-key': "#{queue_name}",
               'x-message-ttl': (::Istox::BunnyBoot.queue_retry_gap consumer_key)
           })
           unless exchange_name.nil?
@@ -115,7 +115,7 @@ module Istox
         # Initiate klass
         ruby_class = ::Istox::BunnyBoot.ruby_class consumer_key
         @workers = {} if @workers.nil?
-        unless ruby_class.nil? || @workers[ruby_class]
+        unless block || @workers[ruby_class]
           klass = Object.const_get(
               '::' + (ruby_class.nil? ? "#{consumer_key.to_s.underscore}_consumer" : ruby_class).camelize
           )
@@ -134,7 +134,6 @@ module Istox
           log.debug "Delivery_info: #{delivery_info}"
           log.debug "Metadata: #{metadata}"
           log.debug "Payload: #{payload}"
-          log.debug "Redelivered Message?: #{delivery_info.redelivered}"
 
           # For retried message, if reaching retry count limit, return ack anyway
           # If retry limit is -1, no retry limit
@@ -144,12 +143,13 @@ module Istox
             processing_paylod = JSON.parse(payload)
             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(processing_paylod, metadata, delivery_info) unless block.nil?
             else
               result = @workers[ruby_class].process(processing_paylod, metadata, delivery_info)
             end
+          else
+            ::Istox::BunnyBoot.cacheMsg(Time.now.to_s, {queue: queue.name, payload: payload})
           end
           # active_channel.ack(delivery_info.delivery_tag) if manual_ack
         rescue StandardError => e
@@ -164,8 +164,6 @@ module Istox
             # @option opts [Integer] :priority Message priority, 0 to 9. Not used by RabbitMQ, only applications
             # here we adopt the unused priority as remaining retry_count
             ::Istox::BunnyBoot.publish(exchange_retry, processing_paylod, routing_key: "#{queue_name}.retry", priority: retry_count, type: 'dlx')
-          else
-            log.info ""
           end
 =begin
           # For redelivered message, call 'reject' not 'nack' in order to reschedule message to tail not head of queue

data/lib/istox/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: istox
 version: !ruby/object:Gem::Version
-  version: 0.1.130.pre.3
+  version: 0.1.130
 platform: ruby
 authors:
 - Siong Leng
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-20 00:00:00.000000000 Z
+date: 2020-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print
@@ -442,9 +442,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.0.8
 signing_key: