rservicebus 0.0.10 → 0.0.11

data/README.md

@@ -7,26 +7,7 @@ A Ruby interpretation of NServiceBus
 	*Dont solve infrastructure problems with software
 		*Infrastructure in this case refers to anything not specific to the application domain
 
-##Points of view in the framework
-	* Bus
-	* Handler
-	* Client
-
-#Platform
-	* Messages
-	* MessageHandler
-	* MessageHandling
-	* Queues
-	* Transport
-	* Transactions
-
-##Message
-	* Yaml
-	* Unique Message ID's
-
 ##Queues
-	* Durable
-	* Store & Forward
 	* Queues specified by config, determined by message type
 
 ##Transport
@@ -38,9 +19,3 @@ A Ruby interpretation of NServiceBus
 	* 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 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.rb

@@ -19,6 +19,7 @@ require "rservicebus/Message/Subscription"
 
 require "rservicebus/AppResource"
 require "rservicebus/AppResource/Redis"
+require "rservicebus/AppResource/Mysql"
 
 require "rservicebus/SubscriptionManager"
 require "rservicebus/SubscriptionStorage"

data/lib/rservicebus/AppResource/Mysql.rb

@@ -0,0 +1,28 @@
+module RServiceBus
+    
+    require "mysql2"
+    
+    #Implementation of an AppResource - Redis
+    class AppResource_Mysql<AppResource
+        
+        @connection
+
+        def initialize( uri )
+            super(uri)
+            host = uri.host
+            database = uri.path.sub( "/", "" )
+            
+            
+            @connection = Mysql2::Client.new(:host => uri.host,
+                                                :database => uri.path.sub( "/", "" ),
+                                                :username => uri.user )
+            puts "AppResource_Mysql. Connected to, " + uri.to_s
+        end
+
+        def getResource
+            return @connection
+        end
+        
+    end
+    
+end

data/lib/rservicebus/Config.rb

@@ -2,7 +2,7 @@ module RServiceBus
 
 #Marshals configuration information for an rservicebus host
 class Config
-	attr_reader :appName, :messageEndpointMappings, :handlerPathList, :localQueueName, :errorQueueName, :maxRetries, :forwardReceivedMessagesTo, :verbose, :beanstalkHost, :queueTimeout
+	attr_reader :appName, :messageEndpointMappings, :handlerPathList, :localQueueName, :errorQueueName, :maxRetries, :forwardReceivedMessagesTo, :verbose, :beanstalkHost, :queueTimeout, :statOutputCountdown
 
 	@appName
 	@messageEndpointMappings
@@ -88,6 +88,7 @@ class Config
 		@maxRetries = self.getValue( "MAX_RETRIES", "5" ).to_i
 		@forwardReceivedMessagesTo = self.getValue( "FORWARD_RECEIVED_MESSAGES_TO" )
 		@queueTimeout = self.getValue( "QUEUE_TIMEOUT", "5" ).to_i
+		@statOutputCountdown = self.getValue( "STAT_OUTPUT_COUNTDOWN", "100" ).to_i
 
 		return self
 	end

data/lib/rservicebus/ConfigureAppResource.rb

@@ -1,30 +1,33 @@
 module RServiceBus
-
-require "uri"
-
-#Configure AppResources for an rservicebus host
-class ConfigureAppResource
-
-	def getResources( env )
-		resources = Hash.new
-
-		env.each do |k,v|
-			if v.is_a?(String) and
+    
+    require "uri"
+    
+    #Configure AppResources for an rservicebus host
+    class ConfigureAppResource
+        
+        def getResources( env )
+            resources = Hash.new
+            
+            env.each do |k,v|
+                if v.is_a?(String) and
 					k.start_with?( "RSB_" ) then
-				uri = URI.parse( v )
-				case uri.scheme
-					when "redis"
+                    uri = URI.parse( v )
+                    case uri.scheme
+                        when "redis"
 						resources[k.sub( "RSB_", "" )] = AppResource_Redis.new( uri )
-					else
+                        
+                        when "mysql"
+                        resources[k.sub( "RSB_", "" )] = AppResource_Mysql.new( uri )
+                        else
 						abort("Scheme, #{uri.scheme}, not recognised when configuring app resource, #{k}=#{v}");
-				end
-			end
-					
-		end
-
-		return resources
-	end
-
-end
-
+                    end
+                end
+                
+            end
+            
+            return resources
+        end
+        
+    end
+    
 end

data/lib/rservicebus/Host.rb

@@ -130,12 +130,19 @@ class Host
 # - Most of this should be queue independant
 	def StartListeningToEndpoints
 		log "Waiting for messages. To exit press CTRL+C"
+		statOutputCountdown = 0
+		messageLoop = true
 
-		loop do
+		while messageLoop do
 			retries = @config.maxRetries
 			#Popping a msg off the queue should not be in the message handler, as it affects retry
 			begin
-    			log @stats.getForReporting
+				if statOutputCountdown == 0 then
+	    			log @stats.getForReporting
+					statOutputCountdown = @config.statOutputCountdown-1
+	    		else
+	    			statOutputCountdown = statOutputCountdown - 1
+	    		end
 				job = @beanstalk.reserve @config.queueTimeout
 				begin
 					body = job.body
@@ -182,13 +189,21 @@ class Host
 					self._SendAlreadyWrappedAndSerialised(serialized_object, @config.errorQueueName)
 					job.delete
 	    		end
+	    	rescue SystemExit, Interrupt
+	    		puts "Exiting on request ..."
+				messageLoop = false
 	    	rescue Exception => e
 	    		if e.message == "TIMED_OUT" then
+	    			#This exception is just saying there are no messages to process
+					statOutputCountdown = 0
+				elsif e.message == "SIGTERM" then
+		    		puts "Exiting on request ..."
+					messageLoop = false
 	    		else
 					puts "*** This is really unexpected."
-			    	puts e.message
+					messageLoop = false
+			    	puts "Message: " + e.message
 			    	puts e.backtrace
-			    	abort()
 		    	end
 		    end
 		end

data/lib/rservicebus/Test/Redis.rb

@@ -35,6 +35,11 @@ class Test_Redis
 		@keyHash[key] = @keyHash[key] + 1
 		return @keyHash[key]
 	end
+
+	def del( key )
+        @keyHash.delete( key )
+	end
+
 end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rservicebus
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-25 00:00:00.000000000 Z
+date: 2012-07-03 00:00:00.000000000 Z
 dependencies: []
 description: A Ruby interpretation of NServiceBus
 email: guy@guyirvine.com
@@ -20,6 +20,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/rservicebus/Agent.rb
+- lib/rservicebus/AppResource/Mysql.rb
 - lib/rservicebus/AppResource/Redis.rb
 - lib/rservicebus/AppResource.rb
 - lib/rservicebus/Config.rb