rservicebus 0.1.42 → 0.1.43

data/lib/rservicebus.rb

@@ -26,6 +26,7 @@ require "rservicebus/Audit"
 require "rservicebus/Message"
 require "rservicebus/Message/Subscription"
 require "rservicebus/Message/StatisticOutput"
+require "rservicebus/Message/VerboseOutput"
 
 require "rservicebus/UserMessage/WithPayload"
 

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, :subscriptionUri, :verbose, :queueTimeout, :statOutputCountdown, :contractList, :libList, :forwardSentMessagesTo, :mqHost
+        attr_reader :appName, :messageEndpointMappings, :handlerPathList, :localQueueName, :errorQueueName, :maxRetries, :forwardReceivedMessagesTo, :subscriptionUri, :queueTimeout, :statOutputCountdown, :contractList, :libList, :forwardSentMessagesTo, :mqHost
         
         @appName
         @messageEndpointMappings
@@ -16,8 +16,6 @@ module RServiceBus
         @forwardReceivedMessagesTo
         @subscriptionUri
         
-        @verbose
-        
         @mq
         
         @queueTimeout
@@ -141,13 +139,7 @@ module RServiceBus
             end
             return self
         end
-        
-        def configureLogging()
-            @verbose = !self.getValue( "VERBOSE", nil ).nil?
-            
-            return self
-        end
-        
+
         def configureMq
             @mqHost = self.getValue( "MQ", "beanstalk://localhost" )
             return self
@@ -193,7 +185,7 @@ module RServiceBus
     end
     
     class ConfigFromSetter<Config
-        attr_writer :appName, :messageEndpointMappings, :handlerPathList, :localQueueName, :errorQueueName, :maxRetries, :forwardReceivedMessagesTo, :verbose, :beanstalkHost
+        attr_writer :appName, :messageEndpointMappings, :handlerPathList, :localQueueName, :errorQueueName, :maxRetries, :forwardReceivedMessagesTo, :beanstalkHost
         
         def initialize()
         end

data/lib/rservicebus/Host.rb

@@ -37,11 +37,7 @@ module RServiceBus
         # @param [String] string Log entry
         # @param [Boolean] ver Indicator for a verbose log entry
         def log(string, ver=false)
-            type = ver ? "VERB" : "INFO"
-            if @config.verbose || !ver then
-                timestamp = Time.new.strftime( "%Y-%m-%d %H:%M:%S" )
-                puts "[#{type}] #{timestamp} :: #{string}"
-            end
+            RServiceBus.log( string, ver )
         end
 
         #Thin veneer for Configuring external resources
@@ -156,7 +152,6 @@ module RServiceBus
         
         def initialize()
             @config = ConfigFromEnv.new
-			.configureLogging()
 			.loadHostSection()
 			.configureMq()
 			.loadContracts()
@@ -228,6 +223,12 @@ module RServiceBus
                             @stats.output = true
                         elsif @msg.msg.class.name == "RServiceBus::Message_StatisticOutputOff" then
                             @stats.output = false
+                            elsif @msg.msg.class.name == "RServiceBus::Message_VerboseOutputOn" then
+                            ENV["VERBOSE"] = "true"
+                            log "Turn on Verbose logging"
+                            elsif @msg.msg.class.name == "RServiceBus::Message_VerboseOutputOff" then
+                            ENV.delete( "VERBOSE" )
+                            log "Turn off Verbose logging"
                         
 
                             else

data/lib/rservicebus/Message.rb

@@ -1,81 +1,81 @@
 module RServiceBus
-
-require 'zlib'
-
-#This is the top level message that is passed around the bus
-class Message
-
-attr_reader :returnAddress, :msgId, :remoteQueueName, :remoteHostName, :lastErrorSourceQueue, :lastErrorString
-
-# Constructor
-#
-# @param [Object] msg The msg to be sent
-# @param [Object] returnAddress A queue to which the destination message handler can send replies
-	def initialize( msg, returnAddress )
-        if !RServiceBus.getValue( "RSBMSG_COMPRESS" ).nil? then
-            @compressed = true
-            @_msg=Zlib::Deflate.deflate(YAML::dump(msg))
-        else
-            @compressed = false
-            @_msg=YAML::dump(msg)
+    
+    require 'zlib'
+    
+    #This is the top level message that is passed around the bus
+    class Message
+        
+        attr_reader :returnAddress, :msgId, :remoteQueueName, :remoteHostName, :lastErrorSourceQueue, :lastErrorString
+        
+        # Constructor
+        #
+        # @param [Object] msg The msg to be sent
+        # @param [Object] returnAddress A queue to which the destination message handler can send replies
+        def initialize( msg, returnAddress )
+            if ENV["RSBMSG_COMPRESS"].nil? then
+                @compressed = false
+                @_msg=YAML::dump(msg)
+                else
+                @compressed = true
+                @_msg=Zlib::Deflate.deflate(YAML::dump(msg))
+            end
+            
+            @returnAddress=returnAddress
+            
+            @createdAt = DateTime.now
+            
+            @msgId=UUIDTools::UUID.random_create
+            @errorList = Array.new
+        end
+        
+        # If an error occurs while processing the message, this method allows details of the error to held
+        # next to the msg.
+        #
+        # Error(s) are held in an array, which allows current error information to be held, while still
+        # retaining historical error messages.
+        #
+        # @param [Object] sourceQueue The name of the queue to which the msg should be returned
+        # @param [Object] errorString A readible version of what occured
+        def addErrorMsg( sourceQueue, errorString )
+            @lastErrorSourceQueue = sourceQueue
+            @lastErrorString = errorString
+            
+            @errorList << RServiceBus::ErrorMessage.new( sourceQueue, errorString )
         end
         
-		@returnAddress=returnAddress
-		
-		@createdAt = DateTime.now
-		
-		@msgId=UUIDTools::UUID.random_create
-		@errorList = Array.new
-	end
-
-# If an error occurs while processing the message, this method allows details of the error to held
-# next to the msg.
-#
-# Error(s) are held in an array, which allows current error information to be held, while still
-# retaining historical error messages.
-#
-# @param [Object] sourceQueue The name of the queue to which the msg should be returned
-# @param [Object] errorString A readible version of what occured
-	def addErrorMsg( sourceQueue, errorString )
-        @lastErrorSourceQueue = sourceQueue
-        @lastErrorString = errorString
+        # Convenience function
+        #
+        # @return [String]
+        def getLastErrorMsg
+            return @errorList.last
+        end
         
-		@errorList << RServiceBus::ErrorMessage.new( sourceQueue, errorString )
-	end
-
-# Convenience function
-#
-# @return [String] 
-	def getLastErrorMsg
-		return @errorList.last
-	end
-
-
-    def setRemoteHostName( hostName )
-        @remoteHostName = hostName
-    end
-    
-    def setRemoteQueueName( queueName )
-        @remoteQueueName = queueName
-    end
-
-
-# @return [Object] The msg to be sent
-	def msg
-        if @compressed == true then
-            return YAML::load( Zlib::Inflate.inflate( @_msg ))
-        else
-            return YAML::load( @_msg )
+        
+        def setRemoteHostName( hostName )
+            @remoteHostName = hostName
+        end
+        
+        def setRemoteQueueName( queueName )
+            @remoteQueueName = queueName
         end
-        rescue ArgumentError => e
+        
+        
+        # @return [Object] The msg to be sent
+        def msg
+            if @compressed == true then
+                return YAML::load( Zlib::Inflate.inflate( @_msg ))
+                else
+                return YAML::load( @_msg )
+            end
+            rescue ArgumentError => e
             raise e if e.message.index( "undefined class/module " ).nil?
-
+            
             puts e.message
             msg_name = e.message.sub( "undefined class/module ", "" )
-        
+            
             raise ClassNotFoundForMsg.new( msg_name )
-	end
-
-end
-
+        end
+        
+    end
+    
 end

data/lib/rservicebus/Message/VerboseOutput.rb

@@ -0,0 +1,10 @@
+module RServiceBus
+
+
+class Message_VerboseOutputOn
+end
+
+class Message_VerboseOutputOff
+end
+
+end

data/lib/rservicebus/helper_functions.rb

@@ -18,10 +18,10 @@ module RServiceBus
         return unless ENV['TESTING'].nil?
     
 		type = ver ? "VERB" : "INFO"
-        #		if @config.verbose || !ver then
-        timestamp = Time.new.strftime( "%Y-%m-%d %H:%M:%S" )
-        puts "[#{type}] #{timestamp} :: #{string}"
-        #		end
+        if !ENV["VERBOSE"].nil? || !ver then
+            timestamp = Time.new.strftime( "%Y-%m-%d %H:%M:%S" )
+            puts "[#{type}] #{timestamp} :: #{string}"
+        end
 	end
 
     def RServiceBus.createAnonymousClass( name_for_class )

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rservicebus
 version: !ruby/object:Gem::Version
-  version: 0.1.42
+  version: 0.1.43
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2013-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uuidtools
-  requirement: &70280048203460 !ruby/object:Gem::Requirement
+  requirement: &70183868520680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70280048203460
+  version_requirements: *70183868520680
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70280048202400 !ruby/object:Gem::Requirement
+  requirement: &70183868520020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70280048202400
+  version_requirements: *70183868520020
 - !ruby/object:Gem::Dependency
   name: beanstalk-client
-  requirement: &70280048201880 !ruby/object:Gem::Requirement
+  requirement: &70183868519240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70280048201880
+  version_requirements: *70183868519240
 - !ruby/object:Gem::Dependency
   name: fluiddb
-  requirement: &70280048201320 !ruby/object:Gem::Requirement
+  requirement: &70183868518700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70280048201320
+  version_requirements: *70183868518700
 - !ruby/object:Gem::Dependency
   name: parse-cron
-  requirement: &70280048200760 !ruby/object:Gem::Requirement
+  requirement: &70183868518120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70280048200760
+  version_requirements: *70183868518120
 description: A Ruby interpretation of NServiceBus
 email: guy@guyirvine.com
 executables:
@@ -110,6 +110,7 @@ files:
 - lib/rservicebus/Host.rb
 - lib/rservicebus/Message/StatisticOutput.rb
 - lib/rservicebus/Message/Subscription.rb
+- lib/rservicebus/Message/VerboseOutput.rb
 - lib/rservicebus/Message.rb
 - lib/rservicebus/Monitor/CsvDir.rb
 - lib/rservicebus/Monitor/CsvPerLine.rb