rservicebus 0.0.7 → 0.0.8

data/README.md

@@ -34,15 +34,17 @@ proving to be a workable framework.
 	* Queues specified by config, determined by message type
 
 ##Transport
-	* RabbitMQ
+	* beanstalk
 
 ##MessageHandler
 	* Name by convention - Handler name matchs filename
+	* Single handler for message is in top level file
+	* Multiple handlers for message are in files under top level directory
 	* Handlers are dynamically loaded
 	* If a handler fails to load, the service wont start - infrastructure problem
 
 ##MessageHandling
 	* Transactions are good, use them
-	* Given transactions, the first to do on error is retry
+	* Given transactions, the first thing to do on error is retry
  	* Once we've used up retry, put the message on an error queue to process later - it's a logic problem	
 	

data/lib/rservicebus/Config.rb

@@ -1,6 +1,6 @@
 module RServiceBus
 
-#Collects and reports configuration information for an rservicebus host
+#Marshals configuration information for an rservicebus host
 class Config
 	attr_reader :appName, :messageEndpointMappings, :handlerPathList, :localQueueName, :errorQueueName, :maxRetries, :forwardReceivedMessagesTo, :verbose, :beanstalkHost
 
@@ -24,12 +24,20 @@ class Config
 		abort()
 	end
 
+	def log( string )
+		puts string
+	end
+
 	def getValue( name, default=nil )
-		value = ENV["#{name}"].nil? ? default : ENV["#{name}"];
-		puts "Env value: #{name}: #{value}"
+		value = ( ENV[name].nil?  || ENV[name] == ""  ) ? default : ENV[name];
+		log "Env value: #{name}: #{value}"
 		return value
 	end
 
+#Marshals data for message end points
+#
+#Expected format;
+#	<msg mame 1>:<end point 1>;<msg mame 2>:<end point 2>
 	def loadMessageEndpointMappings()
 		mapping = self.getValue( "MESSAGE_ENDPOINT_MAPPINGS" )
 
@@ -37,6 +45,12 @@ class Config
 		if !mapping.nil? then
 			mapping.split( ";" ).each do |line|
 				match = line.match( /(.+):(.+)/ )
+				if match.nil? then
+					log "Mapping string provided is invalid"
+					log "The entire mapping string is: #{mapping}"
+					log "*** Could not find ':' in mapping entry, #{line}"
+					exit()
+				end
 				messageEndpointMappings[match[1]] = match[2]
 			end
 		end
@@ -46,6 +60,12 @@ class Config
 		return self
 	end
 
+#Marshals paths for message handlers
+#
+#Note. trailing slashs will be stripped
+#
+#Expected format;
+#	<path 1>;<path 2>
 	def loadHandlerPathList()
 		path = self.getValue( "MSGHANDLERPATH", "./MessageHandler" )
 		handlerPathList = Array.new
@@ -59,10 +79,9 @@ class Config
 		return self
 	end
 
-
 	def loadHostSection()
 		@appName = self.getValue( "APPNAME", "RServiceBus" )
-		@localQueueName = @appName
+		@localQueueName = self.getValue( "LOCAL_QUEUE_NAME", @appName )
 		@errorQueueName = self.getValue( "ERROR_QUEUE_NAME", "error" )
 		@maxRetries = self.getValue( "MAX_RETRIES", "5" ).to_i
 		@forwardReceivedMessagesTo = self.getValue( "FORWARD_RECEIVED_MESSAGES_TO" )
@@ -70,14 +89,34 @@ class Config
 		return self
 	end
 
+	def performRequire( path )
+		require path
+	end
+
+	def ensureContractFileExists( path )
+		if !( File.exists?( path ) ||
+				File.exists?( "#{path}.rb" ) ) then
+			puts "Error while processing contracts"
+			puts "*** path, #{path}, provided does not exist as a file"
+			abort()
+		end
+		if !( File.extname( path ) == "" ||
+				File.extname( path ) == ".rb" ) then
+			puts "Error while processing contracts"
+			puts "*** path, #{path}, should point to a ruby file, with extention .rb"
+			abort()
+		end
+	end
+
 	def loadContracts()
 		if self.getValue( "CONTRACTS", "./Contract" ).nil? then
 			return self
 		end
 
 		self.getValue( "CONTRACTS", "./Contract" ).split( ";" ).each do |path|
-			puts "Loading contracts from, #{path}"
-			require path
+			log "Loading contracts from, #{path}"
+			self.ensureContractFileExists( path )
+			self.performRequire( path )
 		end
 		return self
 	end

data/lib/rservicebus/Host.rb

@@ -98,10 +98,24 @@ class Host
 		log "Load subscriptions"
 		@subscriptions = Hash.new
 		
-		redis = Redis.new
+		begin
+			redis = Redis.new
 
-		prefix = @config.appName + ".Subscriptions."
-		subscriptions = redis.keys prefix + "*Event"
+			prefix = @config.appName + ".Subscriptions."
+			subscriptions = redis.keys prefix + "*Event"
+		rescue Exception => e
+			puts "Error connecting to redis"
+#			puts "Host string, #{@config.beanstalkHost}"
+			if e.message == "Redis::CannotConnectError" ||
+					e.message == "Redis::ECONNREFUSED" then
+				puts "***Most likely, redis is not running. Start redis, and try running this again."
+#				puts "***If you still get this error, check redis is running at, " + beanstalkHost
+			else
+				puts e.message
+				puts e.backtrace
+			end
+			abort()
+		end
 
 		subscriptions.each do |subscriptionName|
 			log "Loading subscription: " + subscriptionName, true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rservicebus
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-20 00:00:00.000000000 Z
+date: 2012-06-25 00:00:00.000000000 Z
 dependencies: []
 description: A ruby implementation of NServiceBus
 email: guy@guyirvine.com