eventhub-processor 0.0.7 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d6896414dd331b83418d8bbf1e7ed6f6efc78f35
-  data.tar.gz: c7b8614fc58ba0cdef80a3532d94a645564d08ee
+  metadata.gz: 8e4ce69b4a807077b43ff86fa599cf2f16a98edd
+  data.tar.gz: 11494b0b12a740701ee3d9485a62cf86bb998554
 SHA512:
-  metadata.gz: 46bc0b39fb711bab9835d507bd6bb1410a154d262c0a25fc9239eda0f7bdf79e70480adba332b5e6f4201b9e31ac293ac7861525ea4689807dc8b991203d3916
-  data.tar.gz: b67fe54f620f45b063721dd6510258b520ea5ec37c7edc83f8e4bbf2ed343588c864726a0f3bb2f6052b3b3a936840b4fb377856a1ae7fa31d4e3bd9ec480f26
+  metadata.gz: 6643282458c6a9fda028a66cdd595cfee83a4b0fd4a37bda1b3efc34a7f645c9bd25b87f2cae6020ea15526f4504c70701fd442d0eac662791c8b072451d59bb
+  data.tar.gz: 4cd12c7edcadf630f7445d6be571fe54e9779a6a09891a726995586b0e1cdc0b0f344222fced136a3d3e85b92dc2c397ef04c6e3e43dc1e968c0459ca9f5d13d

data/lib/eventhub/multi_logger.rb

@@ -19,8 +19,10 @@ module EventHub
     attr_accessor :folder, :devices
 
     def initialize(folder=nil)
-        @folder = folder || Dir.pwd
+        @folder = folder || (Dir.pwd + '/log')
         @devices = []
+
+        FileUtils.makedirs(@folder)
     end
 
     def add_device(device)

data/lib/eventhub/processor.rb

@@ -5,6 +5,10 @@ module EventHub
 
 		include Helper
 
+		def version
+			"1.0.0"
+		end
+
 		def initialize(name=nil)
 			@name = name || class_to_array(self.class)[1..-1].join(".")
 			@folder = Dir.pwd
@@ -14,6 +18,9 @@ module EventHub
 			@messages_successful 		= 0
 			@messages_unsuccessful 	= 0
 
+
+			@channel_receiver = nil
+			@channel_sender		= nil
 			@restart = true
 		end
 
@@ -66,8 +73,6 @@ module EventHub
 
 			EventHub.logger.info("Processor [#{@name}] base folder [#{@folder}]")
 
-			channel = nil
-
 			while @restart
 
 				begin 
@@ -82,10 +87,10 @@ module EventHub
 				  	end
 
 						# create channel
-						channel = AMQP::Channel.new(@connection)
-				  
+						@channel_receiver = AMQP::Channel.new(@connection, prefetch: 1)
+
 				  	# connect to queue
-				  	@queue = channel.queue(self.listener_queue, durable: true, auto_delete: false)
+				  	@queue = @channel_receiver.queue(self.listener_queue, durable: true, auto_delete: false)
 
 				  	# subscribe to queue
 					  @queue.subscribe(:ack => true) do |metadata, payload|	  	
@@ -110,11 +115,11 @@ module EventHub
 						  	messages_to_send.each do |message|
 						  		send_message(message)
 						  	end
-						  	channel.acknowledge(metadata.delivery_tag)
+						  	@channel_receiver.acknowledge(metadata.delivery_tag)
 						  	@messages_successful += 1
 						  	
 					  	rescue => e
-					  		channel.reject(metadata.delivery_tag,false)
+					  		@channel_receiver.reject(metadata.delivery_tag,false)
 					  		@messages_unsuccessful += 1
 					  		EventHub.logger.error("Unexpected exception in handle_message method: #{e}. Message dead lettered.")
 								EventHub.logger.save_detailed_error(e)
@@ -127,6 +132,9 @@ module EventHub
 					  Signal.trap("TERM") {stop_processor}
 					  Signal.trap("INT")  {stop_processor}
 
+					  # post_start is a custom post start routing to be overwritten
+						post_start
+
 					  # Various timers
 					  EventMachine.add_timer(@watchdog_cycle_in_s) { watchdog }
 
@@ -144,6 +152,9 @@ module EventHub
 
 			end # while
 
+			# post_start is a custom post start routing to be overwritten
+			post_stop
+
 			EventHub.logger.info("Processor [#{@name}] has been stopped")
 		ensure
 			# remove pid file
@@ -192,7 +203,8 @@ module EventHub
 
 			now = Time.now
 			message.body = {
-				 heartbeat: {
+				 version: 							self.version,
+				 heartbeat: {             
 				 started: 							now_stamp(@started),
 				 stamp_last_beat:       now_stamp(now), 
 				 uptime:                duration(now-@started),
@@ -212,15 +224,25 @@ module EventHub
 			send_message(message)
 
 			EventMachine.add_timer(self.heartbeat_cycle_in_s) { heartbeat }
+
 		end
 
 		# send message
 		def send_message(message,exchange_name=EH_X_INBOUND)
-			AMQP::Channel.new(@connection) do |channel|
-				channel.direct(exchange_name, :durable => true, :auto_delete => false) do |exchange, declare_ok|
-      		exchange.publish(message.to_json, :persistent => true)
-      	end
+
+			if @channel_sender.nil? || !@channel_sender.open?
+				@channel_sender = AMQP::Channel.new(@connection, prefetch: 1)
+
+				# use publisher confirm
+				@channel_sender.confirm_select
+				  
+				# @channel.on_error { |ch, channel_close| EventHub.logger.error "Oops! a channel-level exception: #{channel_close.reply_text}" }
+        # @channel.on_ack   { |basic_ack| EventHub.logger.info "Received basic_ack: multiple = #{basic_ack.multiple}, delivery_tag = #{basic_ack.delivery_tag}" }
 			end
+
+			exchange = @channel_sender.direct(exchange_name, :durable => true, :auto_delete => false) 
+   		exchange.publish(message.to_json, :persistent => true)
+
 		rescue => e
 				EventHub.logger.error("Unexpected exception while sending message to [#{exchange_name}]: #{e}")
 		end
@@ -238,6 +260,13 @@ module EventHub
 		def stop_processor(restart=false)
 			@restart = restart
 
+			# close channels
+			[@channel_receiver,@channel_sender].each do |channel|
+				if channel
+					channel.close if channel.open?
+				end
+			end
+
 			# stop connection and event loop
 			if @connection
 				@connection.disconnect if @connection.connected?
@@ -255,5 +284,12 @@ module EventHub
   		IO.write("#{@folder}/#{@name}.pid",Process.pid.to_s)
 		end
 
+		def post_start
+			# method which can be overwritten to call a code sequence after reactor start
+		end
+
+		def post_stop
+		end
+
 	end
 end

data/lib/eventhub/version.rb

@@ -1,3 +1,3 @@
 module EventHub
-  VERSION = "0.0.7"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eventhub-processor
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.1.1
 platform: ruby
 authors:
 - Thomas Steiner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-13 00:00:00.000000000 Z
+date: 2014-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler