estorm-message-processor 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b81f8b2169e098058d7854e7aa8c485575d545f
-  data.tar.gz: 1503e3b04071f9874f3412d6a5d40e4ee3c41245
+  metadata.gz: e6a52e4b1ac7f490d976dc431a158b41e795f23e
+  data.tar.gz: d66c939e9b7c6954e21e06dc5d02f85b6927867f
 SHA512:
-  metadata.gz: d799962de1b19fca425f5e875339ea1c8de9fba92d3f012a42c92ba07113e38b8cc78595bc4cc262349ea654ffbe74f222bf910abb1aa8c885352d09bc35781c
-  data.tar.gz: a8160bd65e5e878a7b2df3f04eba6f85e97bab2e7618bf6d9f23d482ce2765b3944c97d29e8722c35a99e30890c943f908b449d8651c19c2fdb5fa104e5ca14c
+  metadata.gz: a590b654b7d6f0d2a5e8fd9d08659e887233e0a2166280ee432ac26360bf3f5196c3c1ab37ab0d9cba15b40824fd4ec0c7c33d319d7bdbe125d6e837c099ba0e
+  data.tar.gz: 56db9ed1d5ae2cebec0151be6f04c22ceae6e325c5376523a5cd65bae01dc13d6b2ff1aacdde3d1ad00f7479f999b780b0a06a791c2cd8aaf5738d5090bf089e

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    estorm-message-processor (0.2.0)
+    estorm-message-processor (0.2.1)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -47,6 +47,6 @@ Use the client to send a message to the delegate processor (background task). No
     bunny.bunny_send(AMQPURL,Rails.env.production?,CONTACT_MESSAGE,cmdhash)
     end
 
-# set the config[:timeout] value if you want the task to exit.  (eg supposedly this is how long until no message is received for the consumer to exist the processing loop)
+# set the config[:exit_when_done] => true value if you want the task to exit.  
 This is useful if you have a back ground task that you want to run occasionally and just process the messages and exit.  For example on heroku you can schedule a job to run every hour and it will process the messages and exit.  This will keep the costs down for the background task on heroku.  (Of course you need to ensure that the job time is shorter than the heroku scheduler time)
 

data/lib/estorm-message-processor/base.rb

@@ -55,30 +55,33 @@ module EstormMessageProcessor
         #  @channel.prefetch(1)   # set quality of service to only delivery one message at a time....
           msg_count,consumer_count = @consumer.queue_statistics  # just to get the stats before entering hte queue
        #  @queue.subscribe(:block => config[:blocking]) do |delivery_info, properties, body|
+         @consumer.target(msg_count,config[:exit_when_done]) if config[:exit_when_done]
          @consumer.on_delivery() do |delivery_info, metadata, payload|
             @consumer.process_messages(delivery_info,metadata,payload)
        #     @consumer.channel.acknowledge(delivery_info.delivery_tag, false) if @consumer.channel!=nil && @consumer.channel.open?
             msg=   "ON DELIVERY: #{@consumer.count}: messages processed"
             logger.info msg
-             
+            @channel.close if @consumer.cancelled? 
                # ack the message to get the next message
             #msg_count,consumer_count = @consumer.queue_statistics  # POSSIBLE RACE CONDITION
            # @consumer.cancel if msg_count==0 && config[:exit_when_empty]
            end
        end
-       
+       def queue_creation(config)
+          setup_bunny_communications(config[:url],config[:connecturlflag],config[:queuename])
+          #@consumer=EstormMessageProcessor::Consumer.new(@channel, @queue, config[:consumer_name], true, false, config)
+          @consumer=EstormMessageProcessor::Consumer.new(@channel, @queue)
+
+          @consumer.logger=logger
+          raise "consumer creation problem" if @consumer==nil
+          msg_count,consumer_count =@consumer.queue_statistics
+          queue_mgmt(config)
+       end
        
        def start(config)
          msg= "Connecting to bunny environment #{config.inspect}"
          logger.info msg
-         setup_bunny_communications(config[:url],config[:connecturlflag],config[:queuename])
-         #@consumer=EstormMessageProcessor::Consumer.new(@channel, @queue, config[:consumer_name], true, false, config)
-         @consumer=EstormMessageProcessor::Consumer.new(@channel, @queue)
-         
-         @consumer.logger=logger
-         raise "consumer creation problem" if @consumer==nil
-         msg_count,consumer_count =@consumer.queue_statistics
-         queue_mgmt(config)  
+         queue_creation(config)
          # the block flag shuts down the thread. the timeout values says whether to unsubscriber
          #need to set ack to true to manage the qos parameter
         # retval= @queue.subscribe_with(@consumer,:ack => true, :block => config[:blocking], :timeout => config[:timeout])
@@ -93,7 +96,8 @@ module EstormMessageProcessor
          tear_down_bunny
            
        end
-        
+       
+    
      
 
 

data/lib/estorm-message-processor/consumer.rb

@@ -12,12 +12,19 @@ module EstormMessageProcessor
         @mycount=0  if @mycount==nil
         @mycount
     end
+    @exit_flag=false
+    def target(count,flag)
+      puts "target is #{count} flag is #{flag}"
+      @exit_flag=flag
+      @exit_count=count-1
+    end
     def increment
        @mycount=self.count+1
+       @cancelled=true if @exit_flag && @exit_count < @mycount
+       @mycount
     end
 
     def handle_cancellation(_)
-      
       msg="consumer cancellation queue called"
       @logger.info msg
       @cancelled = true

data/test/coverage/index.html

@@ -14,7 +14,7 @@
       <img src="./assets/0.7.1/loading.gif" alt="loading"/>
     </div>
     <div id="wrapper" style="display:none;">
-      <div class="timestamp">Generated <abbr class="timeago" title="2013-10-17T08:53:34+08:00">2013-10-17T08:53:34+08:00</abbr></div>
+      <div class="timestamp">Generated <abbr class="timeago" title="2013-10-17T21:16:46+08:00">2013-10-17T21:16:46+08:00</abbr></div>
       <ul class="group_tabs"></ul>
 
       <div id="content">

data/test/test_single.rb

@@ -57,7 +57,7 @@ class EstormMessageProcessTest <  Minitest::Test
   def test_processor_exits_after_queue_empty
      puts "test several  message"
      assert MessageFlag.flag==false, "should be flase #{MessageFlag.inspect}"
-     config={:url => 'fakeurl',:connecturlflag=> false,:queuename => 'testqueueMessageExit', :blocking => true, :consumer_name => "test exit consumer", :timeout => 10 }
+     config={:url => 'fakeurl',:connecturlflag=> false,:queuename => 'testqueueMessageExit', :blocking => true, :consumer_name => "test exit consumer",  :exit_when_done => true}
      # PRELOAD THE QUEUE WITH MESSAGES
        bunnysender=EstormMessageProcessor::Client.new
        bunnysender.setup_bunny(config[:url],config[:connnecturlflag])
@@ -77,7 +77,7 @@ class EstormMessageProcessTest <  Minitest::Test
 #        bunnysender.connection.close
       puts " should  get here this thread about to exit in tes_messag"
      
-      time=30
+      time=10
       puts "sleeping #{time} seconds"
       sleep time
       

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: estorm-message-processor
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Scott Sproule
@@ -88,7 +88,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.4
 requirements: []
 rubyforge_project: estorm-message-processor
-rubygems_version: 2.0.6
+rubygems_version: 2.1.7
 signing_key: 
 specification_version: 4
 summary: Using a AMQP to process a queue. Primarily support for scripting