omnibot 0.0.12 → 0.0.13

data/lib/omnibot/amqpconsumer.rb

@@ -19,13 +19,12 @@ module OmniBot
 		end
 
 		def amqp_loop
-			# setup amqp
-			mq = AMQP::Channel.new
-			exchange = mq.direct(Helpers::amqp_exchange_name)
-			queue = mq.queue("omnibot-consumerqueue", :exclusive => true)
-			queue.bind(exchange)
+			AMQP.start do |connection|
+				OmniLog::info "Setup amqp gem #{AMQP::VERSION}, AMQP protocol #{AMQP::Protocol::VERSION}..."
+				mq = AMQP::Channel.new(connection)
+				exchange = mq.direct(Helpers::amqp_exchange_name)
+				queue = mq.queue('', :exclusive => true).bind(exchange, :routing_key => Helpers::amqp_routing_key)
 
-			begin
 				OmniLog::info "Setup omnibot..."
 				@omnibot = JabberBot.new(Jabber::JID::new(@config['omnibotuser']), @config['omnibotpass'])
 				@omnibot.timer_provider = EM
@@ -39,18 +38,20 @@ module OmniBot
 					handler.startup_pause = index*10
 					handler.start
 				end
+			
+				OmniLog::info "==== AMQP is ready ===="
 
-			rescue => e
-				OmniLog::error "Sending message error: #{e.message}\ntrace:\n#{Helpers::backtrace e}\nExiting..."
-				AMQP.stop{ EM.stop }
-			end
-
-			OmniLog::info "==== AMQP is ready ===="
+				queue.subscribe do |msg|
+					message = Marshal.load msg
+					send_message message
+				end
 
-			queue.subscribe do |msg|
-				message = Marshal.load msg
-				send_message message
 			end
+
+		# it is a function rescue block, don't be afraid
+		rescue => e
+			OmniLog::error "AMQP/Jabber setup error: #{e.message}\ntrace:\n#{Helpers::backtrace e}\nExiting..."
+			AMQP.stop{ EM.stop }
 		end
 
 		# Main AMQP loop
@@ -62,10 +63,8 @@ module OmniBot
 				AMQP.stop{ EM.stop }
 			end
 
-			AMQP.start do
-				amqp_loop
-			end
-
+			amqp_loop
+			
 			OmniLog::info "Exited"
 		end
 

data/lib/omnibot/helpers.rb

@@ -57,6 +57,10 @@ module OmniBot
 		def self.amqp_exchange_name
 			'omnibot-exchange'
 		end
+		
+		def self.amqp_routing_key
+			'omnibot-routing'
+		end
 
 	end
 

data/lib/omnibot/omnisend.rb

@@ -13,12 +13,11 @@ module OmniBot
 
 			Signal.trap('INT') { AMQP.stop{ EM.stop } }
 
-			AMQP.start do
-				mq = AMQP::Channel.new
+			AMQP.start do |connection|
+				mq = AMQP::Channel.new(connection)
 				exchange = mq.direct(Helpers::amqp_exchange_name)
-				exchange.publish(data)
-				puts 'sent'
-				AMQP.stop{ EM.stop }
+				exchange.publish(data, :routing_key => Helpers::amqp_routing_key)
+				EM.add_timer(2.0) { connection.close { puts 'sent' ; EM.stop } }
 			end
 		end
 	end

data/lib/omnibot/version.rb

@@ -1,3 +1,3 @@
 module OmniBot
-	VERSION = '0.0.12'
+	VERSION = '0.0.13'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omnibot
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-28 00:00:00.000000000Z
+date: 2011-11-10 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xmpp4r
-  requirement: &70295142817300 !ruby/object:Gem::Requirement
+  requirement: &70201186655820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70295142817300
+  version_requirements: *70201186655820
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &70295142815520 !ruby/object:Gem::Requirement
+  requirement: &70201186654920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70295142815520
+  version_requirements: *70201186654920
 - !ruby/object:Gem::Dependency
-  name: amqp
-  requirement: &70295142814260 !ruby/object:Gem::Requirement
+  name: mail
+  requirement: &70201186654100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70295142814260
+  version_requirements: *70201186654100
 - !ruby/object:Gem::Dependency
-  name: mail
-  requirement: &70295142813420 !ruby/object:Gem::Requirement
+  name: sqlite3
+  requirement: &70201186652760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,18 +54,18 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70295142813420
+  version_requirements: *70201186652760
 - !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: &70295142812580 !ruby/object:Gem::Requirement
+  name: amqp
+  requirement: &70201186651480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.8.0
   type: :runtime
   prerelease: false
-  version_requirements: *70295142812580
+  version_requirements: *70201186651480
 description: Works with AMQP for sending messages at server side.Sends notifications
   to an user via XMPP.Can monitor system by performing daily commands.
 email: theirix@gmail.com
@@ -110,7 +110,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1612202538999953127
+      hash: 3706692739125381398
 requirements:
 - AMQP-compatible server (for example, RabbitMQ)
 rubyforge_project: nowarning