rservicebus 0.0.8 → 0.0.9

data/lib/rservicebus.rb

@@ -9,14 +9,14 @@ require "rservicebus/helper_functions"
 require "rservicebus/Agent"
 require "rservicebus/ErrorMessage"
 require "rservicebus/Message"
-require "rservicebus/Subscription"
 require "rservicebus/HandlerLoader"
 require "rservicebus/ConfigureAppResource"
-require "rservicebus/AppResource"
-require "rservicebus/RedisAppResource"
 require "rservicebus/Host"
 require "rservicebus/Config"
 
+require "rservicebus/AppResource"
+require "rservicebus/AppResource/Redis"
+
 
 module RServiceBus
 

data/lib/rservicebus/{RedisAppResource.rb → AppResource/Redis.rb}

@@ -1,7 +1,7 @@
 require "redis"
 
 #Implementation of an AppResource - Redis
-class RedisAppResource<AppResource
+class AppResource_Redis<AppResource
 
 	@connection
 

data/lib/rservicebus/Config.rb

@@ -108,6 +108,12 @@ class Config
 		end
 	end
 
+#Marshals paths for contracts
+#
+#Note. .rb extension is optional
+#
+#Expected format;
+#	/one/two/Contracts
 	def loadContracts()
 		if self.getValue( "CONTRACTS", "./Contract" ).nil? then
 			return self

data/lib/rservicebus/ConfigureAppResource.rb

@@ -12,7 +12,7 @@ class ConfigureAppResource
 				uri = URI.parse( v )
 				case uri.scheme
 					when "redis"
-						resources[k.sub( "RSB_", "" )] = RedisAppResource.new( uri )
+						resources[k.sub( "RSB_", "" )] = AppResource_Redis.new( uri )
 					else
 						abort("Scheme, #{uri.scheme}, not recognised when configuring app resource, #{k}=#{v}");
 				end

data/lib/rservicebus/Host.rb

@@ -1,5 +1,6 @@
 module RServiceBus
 
+#Host process for rservicebus
 class Host
 
 
@@ -11,8 +12,7 @@ class Host
 	
 	@beanstalk
 
-	@appResources
-	
+	@appResources	
 	
 	@config
 
@@ -48,21 +48,18 @@ class Host
 		return self
 	end
 
-	def initialize()
-
-		@config = ConfigFromEnv.new
-			.configureLogging()
-			.loadHostSection()
-			.configureBeanstalk()
-			.loadContracts()
-			.loadMessageEndpointMappings()
-			.loadHandlerPathList();
-
-		self.configureAppResource()
-			.connectToBeanstalk()
-			.loadHandlers()
-			.loadSubscriptions()
-			.sendSubscriptions()
+#Subscriptions are specified by adding events to the
+#msg endpoint mapping
+	def sendSubscriptions
+		log "Send Subscriptions"
+		@config.messageEndpointMappings.each do |eventName,queueName|
+			log "Checking, " + eventName + " for Event", true
+			if eventName.end_with?( "Event" ) then
+				log eventName + ", is an event. About to send subscription to, " + queueName, true
+				self.Subscribe( eventName )
+				log "Subscribed to, " + eventName + " at, " + queueName
+			end
+		end
 
 		return self
 	end
@@ -80,20 +77,7 @@ class Host
 		return self
 	end
 
-	def sendSubscriptions
-		log "Send Subscriptions"
-		@config.messageEndpointMappings.each do |eventName,queueName|
-			log "Checking, " + eventName + " for Event", true
-			if eventName.end_with?( "Event" ) then
-				log eventName + ", is an event. About to send subscription to, " + queueName, true
-				self.Subscribe( eventName )
-				log "Subscribed to, " + eventName + " at, " + queueName
-			end
-		end
-
-		return self
-	end
-
+#Load an existing subscription - startup function
 	def loadSubscriptions
 		log "Load subscriptions"
 		@subscriptions = Hash.new
@@ -133,6 +117,26 @@ class Host
 		return self
 	end
 
+	def initialize()
+
+		@config = ConfigFromEnv.new
+			.configureLogging()
+			.loadHostSection()
+			.configureBeanstalk()
+			.loadContracts()
+			.loadMessageEndpointMappings()
+			.loadHandlerPathList();
+
+		self.configureAppResource()
+			.connectToBeanstalk()
+			.loadHandlers()
+			.loadSubscriptions()
+			.sendSubscriptions()
+
+		return self
+	end
+
+#Process a subscription request from a subscriber
 	def addSubscrption( eventName, queueName )
 		log "Adding subscrption for, " + eventName + ", to, " + queueName
 		redis = Redis.new
@@ -162,10 +166,11 @@ class Host
 		log "Waiting for messages. To exit press CTRL+C"
 
 		loop do
-			job = @beanstalk.reserve
-			body = job.body
 			retries = @config.maxRetries
 			begin
+				job = @beanstalk.reserve
+				body = job.body
+
 				@msg = YAML::load(body)
 				if @msg.msg.class.name == "RServiceBus::Subscription" then
 					self.addSubscrption( @msg.msg.eventName, @msg.returnAddress )
@@ -177,8 +182,21 @@ class Host
 				end
 				job.delete
 	    	rescue Exception => e
+			sleep 0.5
 		    	retry if (retries -= 1) > 0		    	
 
+				if e.class.name == "Beanstalk::NotConnected" then
+					puts "Lost connection to beanstalkd."
+					puts "*** Start or Restart beanstalkd and try again."
+					abort();
+				end
+				
+				if e.class.name == "Redis::CannotConnectError" then
+					puts "Lost connection to redis."
+					puts "*** Start or Restart redis and try again."
+					abort();
+				end
+
 				errorString = e.message + ". " + e.backtrace[0]
 					if e.backtrace.length > 1 then
 						errorString = errorString + ". " + e.backtrace[1]
@@ -216,6 +234,10 @@ class Host
     	end
 	end
 
+#Sends a msg across the bus
+#
+# @param [String] serialized_object serialized RServiceBus::Message
+# @param [String] queueName endpoint to which the msg will be sent
 	def _SendAlreadyWrappedAndSerialised( serialized_object, queueName )
 		log "Bus._SendAlreadyWrappedAndSerialised", true
 
@@ -223,6 +245,10 @@ class Host
 		@beanstalk.put( serialized_object )
 	end
 
+#Sends a msg across the bus
+#
+# @param [RServiceBus::Message] msg msg to be sent
+# @param [String] queueName endpoint to which the msg will be sent
 	def _SendNeedsWrapping( msg, queueName )
 		log "Bus._SendNeedsWrapping", true
 
@@ -232,6 +258,11 @@ class Host
 		self._SendAlreadyWrappedAndSerialised( serialized_object, queueName )
 	end
 
+#Sends a msg back across the bus
+#Reply queues are specified in each msg. It works like
+#email, where the reply address can actually be anywhere
+#
+# @param [RServiceBus::Message] msg msg to be sent
 	def Reply( msg )
 		log "Reply with: " + msg.class.name + " To: " + @msg.returnAddress, true
 
@@ -239,10 +270,13 @@ class Host
 	end
 
 
+#Send a msg across the bus
+#msg destination is specified at the infrastructure level
+#
+# @param [RServiceBus::Message] msg msg to be sent
 	def Send( msg )
 		log "Bus.Send", true
 
-
 		msgName = msg.class.name
 		if !@config.messageEndpointMappings.has_key?( msgName ) then
 			log "No end point mapping found for: " + msgName
@@ -255,6 +289,9 @@ class Host
 		self._SendNeedsWrapping( msg, queueName )
 	end
 
+#Sends an event to all subscribers across the bus
+#
+# @param [RServiceBus::Message] msg msg to be sent
 	def Publish( msg )
 		log "Bus.Publish", true
 
@@ -270,6 +307,9 @@ class Host
 
 	end
 
+#Sends a subscription request across the Bus
+#
+# @param [String] eventName event to be subscribes to
 	def Subscribe( eventName )
 		log "Bus.Subscribe: " + eventName, true
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rservicebus
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -19,6 +19,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/rservicebus/Agent.rb
+- lib/rservicebus/AppResource/Redis.rb
 - lib/rservicebus/AppResource.rb
 - lib/rservicebus/Config.rb
 - lib/rservicebus/ConfigureAppResource.rb
@@ -27,8 +28,6 @@ files:
 - lib/rservicebus/helper_functions.rb
 - lib/rservicebus/Host.rb
 - lib/rservicebus/Message.rb
-- lib/rservicebus/RedisAppResource.rb
-- lib/rservicebus/Subscription.rb
 - lib/rservicebus/Test/Bus.rb
 - lib/rservicebus/Test/Redis.rb
 - lib/rservicebus/Test.rb

data/lib/rservicebus/Subscription.rb

@@ -1,13 +0,0 @@
-module RServiceBus
-
-
-class Subscription
-	attr_reader :eventName
-
-	def initialize( eventName )
-		@eventName=eventName
-	end
-	
-end
-
-end