rservicebus 0.1.50 → 0.1.52

data/lib/rservicebus/Agent.rb

@@ -12,7 +12,7 @@ end
         def getAgent( uri )
             ENV["RSBMQ"] = uri.to_s
 
-            RServiceBus.log "*** Agent.getAgent has been deprecated. Set the environment variable, RSBMQ, and simply create the class", true
+            RServiceBus.rlog "*** Agent.getAgent has been deprecated. Set the environment variable, RSBMQ, and simply create the class"
 	    return Agent.new
         end
         

data/lib/rservicebus/AppResource.rb

@@ -17,7 +17,7 @@ module RServiceBus
 
         def _connect
             @connection = self.connect(@uri)
-            @host.log "#{self.class.name}. Connected to, #{@uri.to_s}", true
+            RServiceBus.rlog "#{self.class.name}. Connected to, #{@uri.to_s}"
         end
 
         # Resources are attached resources, and can be specified using the URI syntax.

data/lib/rservicebus/ConfigureMonitor.rb

@@ -25,8 +25,8 @@ module RServiceBus
         # @param [RServiceBus::Handler] handler
         ## @param [Hash] appResources As hash[k,v] where k is the name of a resource, and v is the resource
         def setAppResources( monitor )
-            @host.log "Checking app resources for: #{monitor.class.name}", true
-            @host.log "If your attribute is not getting set, check that it is in the 'attr_accessor' list", true
+            RServiceBus.rlog "Checking app resources for: #{monitor.class.name}"
+            RServiceBus.rlog "If your attribute is not getting set, check that it is in the 'attr_accessor' list"
             @appResources.each do |k,v|
                 if monitor.class.method_defined?( k ) then
                     monitor.instance_variable_set( "@#{k}", v.getResource() )

data/lib/rservicebus/CronManager.rb

@@ -55,7 +55,7 @@ class CronManager
         @Bus = host
         @msgNames = msgNames
         
-        @Bus.log "Load Cron", true
+        RServiceBus.rlog "Load Cron"
         @list = Array.new
         ENV.each do |k,v|
             if k.start_with?( "RSBCRON_" ) then
@@ -75,7 +75,7 @@ class CronManager
         now = Time.now
         @list.each_with_index do |v,idx|
             if now > v['next'] then
-                @Bus.log "CronManager.Send, #{v['name']}", true
+                RServiceBus.rlog "CronManager.Send, #{v['name']}"
                 @Bus.Send( RServiceBus.createAnonymousClass( v['name'] ) )
                 @list[idx]['next'] = v['cron'].next(now)
             end

data/lib/rservicebus/EndpointMapping.rb

@@ -23,7 +23,7 @@ module RServiceBus
                 exit()
             end
             
-            self.log( "EndpointMapping.configureMapping: #{match[1]}, #{match[2]}", true )
+            RServiceBus.rlog "EndpointMapping.configureMapping: #{match[1]}, #{match[2]}"
             @endpoints[match[1]] = match[2]
             
             @queueNameList.each do |q|

data/lib/rservicebus/HandlerLoader.rb

@@ -79,16 +79,16 @@ class HandlerLoader
 # @returns [RServiceBus::Handler] handler
 	def loadHandler(msgName, filePath, handlerName)
         if @listOfLoadedPaths.has_key?( filePath ) then
-            @host.log "Not reloading, #{filePath}"
+            RServiceBus.log "Not reloading, #{filePath}"
             return
         end
 
 		begin
-			@host.log "filePath: " + filePath, true
-			@host.log "handlerName: " + handlerName, true
+			RServiceBus.rlog "filePath: " + filePath
+			RServiceBus.rlog "handlerName: " + handlerName
 
 			handler = self.loadHandlerFromFile( handlerName, filePath )
-			@host.log "Loaded Handler: " + handlerName
+			RServiceBus.log "Loaded Handler: " + handlerName
 
             @handlerManager.addHandler( msgName, handler )
             

data/lib/rservicebus/HandlerManager.rb

@@ -26,7 +26,7 @@ module RServiceBus
         def setBusAttributeIfRequested( handler )
             if defined?( handler.Bus ) then
                 handler.Bus = @host
-                @host.log "Bus attribute set for: " + handler.class.name
+                RServiceBus.log "Bus attribute set for: " + handler.class.name
             end
             
             return self
@@ -38,7 +38,7 @@ module RServiceBus
         def setStateAttributeIfRequested( handler )
             if defined?( handler.State ) then
                 handler.State = @stateManager.Get( handler )
-                @host.log "Bus attribute set for: " + handler.class.name
+                RServiceBus.log "Bus attribute set for: " + handler.class.name
             end
             
             return self
@@ -54,14 +54,14 @@ module RServiceBus
         end
         
         def interrogateHandlerForAppResources( handler )
-            @host.log "Checking app resources for: #{handler.class.name}", true
-            @host.log "If your attribute is not getting set, check that it is in the 'attr_accessor' list", true
+            RServiceBus.rlog "Checking app resources for: #{handler.class.name}"
+            RServiceBus.rlog "If your attribute is not getting set, check that it is in the 'attr_accessor' list"
             
             @resourceListByHandlerName[handler.class.name] = Array.new
             @appResources.each do |k,v|
                 if handler.class.method_defined?( k ) then
                     @resourceListByHandlerName[handler.class.name] << k
-                    @host.log "Resource attribute, #{k}, found for: " + handler.class.name
+                    RServiceBus.log "Resource attribute, #{k}, found for: " + handler.class.name
                 end
             end
             
@@ -83,14 +83,14 @@ module RServiceBus
         # @param [RServiceBus::Handler] handler
         ## @param [Hash] appResources As hash[k,v] where k is the name of a resource, and v is the resource
         def setAppResources_to_be_removed( handler )
-            @host.log "Checking app resources for: #{handler.class.name}", true
-            @host.log "If your attribute is not getting set, check that it is in the 'attr_accessor' list", true
+            RServiceBus.rlog "Checking app resources for: #{handler.class.name}"
+            RServiceBus.rlog "If your attribute is not getting set, check that it is in the 'attr_accessor' list"
             @appResources.each do |k,v|
                 if handler.class.method_defined?( k ) then
                     v._connect
                     #                    v.Begin
                     handler.instance_variable_set( "@#{k}", v.getResource() )
-                    @host.log "App resource attribute, #{k}, set for: " + handler.class.name
+                    RServiceBus.log "App resource attribute, #{k}, set for: " + handler.class.name
                 end
             end
             
@@ -114,7 +114,7 @@ module RServiceBus
                 next if @resourceListByHandlerName[handler.class.name].nil?
                 @resourceListByHandlerName[handler.class.name].each do |k|
                     handler.instance_variable_set( "@#{k}", @appResources[k].getResource() )
-                    @host.log "App resource attribute, #{k}, set for: " + handler.class.name, true
+                    RServiceBus.rlog "App resource attribute, #{k}, set for: " + handler.class.name
                 end
             end
             
@@ -129,7 +129,7 @@ module RServiceBus
                 r = @appResources[resourceName]
                 r._connect
                 r.Begin
-                @host.log( "Preparing resource: #{resourceName}. Begin", true )
+                RServiceBus.rlog "Preparing resource: #{resourceName}. Begin"
             end
             
             self.setResourcesForHandlersNeededToProcessMsg( msgName )
@@ -138,11 +138,11 @@ module RServiceBus
         end
         
         def commitResourcesUsedToProcessMsg( msgName )
-            @host.log "HandlerManager.commitResourcesUsedToProcessMsg, #{msgName}", true
+            RServiceBus.rlog "HandlerManager.commitResourcesUsedToProcessMsg, #{msgName}"
             list = self.getListOfResourcesNeededToProcessMsg( msgName )
             list.each do |resourceName|
                 r = @appResources[resourceName]
-                @host.log "Commit resource, #{r.class.name}", true
+                RServiceBus.rlog "Commit resource, #{r.class.name}"
                 r.Commit
                 r.finished
             end
@@ -150,12 +150,12 @@ module RServiceBus
         end
         
         def rollbackResourcesUsedToProcessMsg( msgName )
-            @host.log "HandlerManager.rollbackResourcesUsedToProcessMsg, #{msgName}", true
+            RServiceBus.rlog "HandlerManager.rollbackResourcesUsedToProcessMsg, #{msgName}"
             list = self.getListOfResourcesNeededToProcessMsg( msgName )
             list.each do |resourceName|
                 begin
                     r = @appResources[resourceName]
-                    @host.log "Rollback resource, #{r.class.name}", true
+                    RServiceBus.rlog "Rollback resource, #{r.class.name}"
                     r.Rollback
                     r.finished
                     rescue Exception => e1

data/lib/rservicebus/Host.rb

@@ -115,7 +115,7 @@ module RServiceBus
             
             @config.contractList.each do |path|
                 require path
-                log "Loaded Contract: #{path}", true
+                RServiceBus.rlog "Loaded Contract: #{path}"
             end
             
             return self
@@ -343,7 +343,7 @@ module RServiceBus
                 msgName = @msg.msg.class.name
                 handlerList = @handlerManager.getHandlerListForMsg(msgName)
                 
-                log "Handler found for: " + msgName, true
+                RServiceBus.rlog "Handler found for: " + msgName
                 begin
                     @queueForMsgsToBeSentOnComplete = Array.new
 
@@ -381,7 +381,7 @@ module RServiceBus
             # @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
+                RServiceBus.rlog "Bus._SendAlreadyWrappedAndSerialised"
 
                 if !@config.forwardSentMessagesTo.nil? then
                     @mq.send( @config.forwardSentMessagesTo, serialized_object )
@@ -395,18 +395,18 @@ module RServiceBus
             # @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
+                RServiceBus.rlog "Bus._SendNeedsWrapping"
 
                 rMsg = RServiceBus::Message.new( msg, @mq.localQueueName )
                 if queueName.index( "@" ).nil? then
                     q = queueName
-                    log "Sending, #{msg.class.name} to, queueName", true
+                    RServiceBus.rlog "Sending, #{msg.class.name} to, queueName"
                     else
                     parts = queueName.split( "@" )
                     rMsg.setRemoteQueueName( parts[0] )
                     rMsg.setRemoteHostName( parts[1] )
                     q = 'transport-out'
-                    log "Sending, #{msg.class.name} to, #{queueName}, via #{q}", true
+                    RServiceBus.rlog "Sending, #{msg.class.name} to, #{queueName}, via #{q}"
                 end
 
                 serialized_object = YAML::dump(rMsg)
@@ -429,7 +429,7 @@ module RServiceBus
             #
             # @param [RServiceBus::Message] msg msg to be sent
             def Reply( msg )
-                log "Reply with: " + msg.class.name + " To: " + @msg.returnAddress, true
+                RServiceBus.rlog "Reply with: " + msg.class.name + " To: " + @msg.returnAddress
                 @stats.incTotalReply
 
                 self.queueMsgForSendOnComplete( msg, @msg.returnAddress )
@@ -452,7 +452,7 @@ module RServiceBus
             #
             # @param [RServiceBus::Message] msg msg to be sent
             def Send( msg )
-                log "Bus.Send", true
+                RServiceBus.rlog "Bus.Send"
                 @stats.incTotalSent
                 
                 msgName = msg.class.name
@@ -465,7 +465,7 @@ module RServiceBus
             #
             # @param [RServiceBus::Message] msg msg to be sent
             def Publish( msg )
-                log "Bus.Publish", true
+                RServiceBus.rlog "Bus.Publish"
                 @stats.incTotalPublished
                 
                 subscriptions = @subscriptionManager.get(msg.class.name)
@@ -479,7 +479,7 @@ module RServiceBus
             #
             # @param [String] eventName event to be subscribes to
             def Subscribe( eventName )
-                log "Bus.Subscribe: " + eventName, true
+                RServiceBus.rlog "Bus.Subscribe: " + eventName
 
                 queueName = self.getEndpointForMsg( eventName )
                 subscription = Message_Subscription.new( eventName )

data/lib/rservicebus/Monitor/Dir.rb

@@ -127,13 +127,13 @@ module RServiceBus
             
             fileList = Dir.glob( "#{@Path}/*" )
             fileList.each do |filePath|
-                @Bus.log "Ready to process, #{filePath}", true
+                RServiceBus.log "Ready to process, #{filePath}"
                 content = self.ProcessPath( filePath )
                 
                 if !@ArchiveDir.nil? then
                     basename = File.basename( filePath )
                     newFilePath = @ArchiveDir + "/" + basename + "." + DateTime.now.strftime( "%Y%m%d%H%M%S%L") + ".zip"
-                    @Bus.log "Writing to archive, #{newFilePath}", true
+                    RServiceBus.log "Writing to archive, #{newFilePath}"
                     
                     Zip::ZipOutputStream.open(newFilePath) {
                         |zos|
@@ -144,8 +144,8 @@ module RServiceBus
                 File.unlink( filePath )
                 
                 fileProcessed = fileProcessed + 1
-                @Bus.log "Processed #{fileProcessed} of #{fileList.length}.", true
-                @Bus.log "Allow system tick #{self.class.name}", true
+                RServiceBus.log "Processed #{fileProcessed} of #{fileList.length}."
+                RServiceBus.log "Allow system tick #{self.class.name}"
                 return if fileProcessed >= maxFilesProcessed
             end
             

data/lib/rservicebus/Transporter.rb

@@ -14,16 +14,9 @@ module RServiceBus
     
     class Transporter
         
-        def log( string, verbose=false )
-            if verbose == false ||
-                ( !ENV["VERBOSE"].nil? && ENV["VERBOSE"].upcase == "TRUE") then
-                puts string
-            end
-        end
-        
         def getValue( name, default=nil )
             value = ( ENV[name].nil?  || ENV[name] == ""  ) ? default : ENV[name];
-            log "Env value: #{name}: #{value}"
+            RServiceBus.log "Env value: #{name}: #{value}"
             return value
         end
         
@@ -33,7 +26,7 @@ module RServiceBus
             @source = Beanstalk::Pool.new([sourceUrl])
             @source.watch sourceQueueName
             
-            log "Connected to, #{sourceQueueName}@#{sourceUrl}"
+            RServiceBus.log "Connected to, #{sourceQueueName}@#{sourceUrl}"
             
             rescue Exception => e
             puts "Error connecting to Beanstalk"
@@ -50,7 +43,7 @@ module RServiceBus
         
         
         def disconnect
-            log "Disconnect from, #{@remoteUserName}@#{@remoteHostName}/#{@remoteQueueName}"
+            RServiceBus.log "Disconnect from, #{@remoteUserName}@#{@remoteHostName}/#{@remoteQueueName}"
             @gateway.shutdown! unless @gateway.nil?
             @gateway = nil
             @remoteHostName = nil
@@ -64,7 +57,7 @@ module RServiceBus
         
         
         def connect( remoteHostName )
-            log "connect called, #{remoteHostName}", true
+            RServiceBus.rlog "connect called, #{remoteHostName}"
             if @gateway.nil? || remoteHostName != @remoteHostName || @destination.nil? then
                 self.disconnect
             end
@@ -74,20 +67,20 @@ module RServiceBus
                 @remoteHostName = remoteHostName
                 @remoteUserName = getValue( "REMOTE_USER_#{remoteHostName.upcase}" )
                 if @remoteUserName.nil? then
-                    log "**** Username not specified for Host, #{remoteHostName}"
-                    log "**** Add an environment variable of the form, REMOTE_USER_#{remoteHostName.upcase}=[USERNAME]"
+                    RServiceBus.log "**** Username not specified for Host, #{remoteHostName}"
+                    RServiceBus.log "**** Add an environment variable of the form, REMOTE_USER_#{remoteHostName.upcase}=[USERNAME]"
                     abort()
                 end
                 
                 @localPort = getValue( "LOCAL_PORT", 27018 ).to_i
-                log "Local Port: #{@localPort}", true
+                RServiceBus.rlog "Local Port: #{@localPort}"
                 
                 begin
-                    log "Connect SSH, #{@remoteUserName}@#{@remoteHostName}"
+                    RServiceBus.log "Connect SSH, #{@remoteUserName}@#{@remoteHostName}"
                     # Open port 27018 to forward to 127.0.0.11300 on the remote host
                     @gateway = Net::SSH::Gateway.new(@remoteHostName, @remoteUserName)
                     @gateway.open('127.0.0.1', 11300, @localPort)
-                    log "Connected to SSH, #{@remoteUserName}@#{@remoteHostName}"
+                    RServiceBus.log "Connected to SSH, #{@remoteUserName}@#{@remoteHostName}"
                     
                     rescue Errno::EADDRINUSE => e
                     puts "*** Local transport port in use, #{@localPort}"
@@ -102,9 +95,9 @@ module RServiceBus
                 
                 begin
                     destinationUrl = "127.0.0.1:#{@localPort}"
-                    log "Connect to Remote Beanstalk, #{destinationUrl}", true
+                    RServiceBus.rlog "Connect to Remote Beanstalk, #{destinationUrl}"
                     @destination = Beanstalk::Pool.new([destinationUrl])
-                    log "Connected to Remote Beanstalk, #{destinationUrl}"
+                    RServiceBus.rlog "Connected to Remote Beanstalk, #{destinationUrl}"
                     rescue Exception => e
                     if e.message == "Beanstalk::NotConnected" then
                         puts "***Could not connect to destination, check beanstalk is running at, #{destinationUrl}"
@@ -123,10 +116,10 @@ module RServiceBus
             self.connect( msg.remoteHostName )
             
             @remoteQueueName = msg.remoteQueueName
-            log "Put msg, #{msg.remoteQueueName}", true
+            RServiceBus.rlog "Put msg, #{msg.remoteQueueName}"
             @destination.use( msg.remoteQueueName )
             @destination.put( job.body )
-            log "Msg put, #{msg.remoteQueueName}"
+            RServiceBus.log "Msg put, #{msg.remoteQueueName}"
             
             if !ENV['AUDIT_QUEUE_NAME'].nil? then
                 @source.use ENV['AUDIT_QUEUE_NAME']
@@ -135,13 +128,13 @@ module RServiceBus
             #removeJob
             job.delete
             
-            log "Job sent to, #{@remoteUserName}@#{@remoteHostName}/#{@remoteQueueName}"
+            RServiceBus.log "Job sent to, #{@remoteUserName}@#{@remoteHostName}/#{@remoteQueueName}"
             
             
             rescue Exception => e
             self.disconnect
             if e.message == "TIMED_OUT" then
-                log "No Msg", true
+                RServiceBus.rlog "No Msg"
                 return
             end
             raise e

data/lib/rservicebus/helper_functions.rb

@@ -1,5 +1,5 @@
 module RServiceBus
-
+    
     
 	def RServiceBus.convertDTOToHash( obj )
 		hash = {};
@@ -13,17 +13,24 @@ module RServiceBus
         
 		return hash.to_json
 	end
-
+    
 	def RServiceBus.log(string, ver=false)
         return unless ENV['TESTING'].nil?
-    
+        
 		type = ver ? "VERB" : "INFO"
         if !ENV["VERBOSE"].nil? || !ver then
             timestamp = Time.new.strftime( "%Y-%m-%d %H:%M:%S" )
             puts "[#{type}] #{timestamp} :: #{string}"
         end
 	end
-
+    
+    def RServiceBus.rlog(string)
+        if !ENV["RSBVERBOSE"].nil? then
+            timestamp = Time.new.strftime( "%Y-%m-%d %H:%M:%S" )
+            puts "[RSB] #{timestamp} :: #{string}"
+        end
+    end
+    
     def RServiceBus.createAnonymousClass( name_for_class )
         newAnonymousClass = Class.new(Object)
         Object.const_set( name_for_class, newAnonymousClass )
@@ -35,19 +42,19 @@ module RServiceBus
         log "Env value: #{name}: #{value}"
         return value
     end
-
+    
     def RServiceBus.sendMsg( msg, responseQueue="agent" )
-	require "rservicebus/EndpointMapping"
-	endpointMapping = EndpointMapping.new
-	endpointMapping.Configure
-	queueName = endpointMapping.get( msg.class.name )
-
-    ENV["RSBMQ"] = "beanstalk://localhost" if ENV["RSBMQ"].nil?
-    agent = RServiceBus::Agent.new
-    Audit.new( agent ).audit( msg )
-	agent.sendMsg(msg, queueName, responseQueue)
-
-	rescue QueueNotFoundForMsg=>e
+        require "rservicebus/EndpointMapping"
+        endpointMapping = EndpointMapping.new
+        endpointMapping.Configure
+        queueName = endpointMapping.get( msg.class.name )
+        
+        ENV["RSBMQ"] = "beanstalk://localhost" if ENV["RSBMQ"].nil?
+        agent = RServiceBus::Agent.new
+        Audit.new( agent ).audit( msg )
+        agent.sendMsg(msg, queueName, responseQueue)
+        
+        rescue QueueNotFoundForMsg=>e
 		msg = "\n"
 		msg = "#{msg}*** Queue not found for, #{e.message}\n"
 		msg = "#{msg}*** Ensure you have an environment variable set for this Message Type, eg, \n"
@@ -79,8 +86,13 @@ module RServiceBus
         agent = RServiceBus::Agent.new
         msg = agent.checkForReply( queueName )
         Audit.new( agent ).auditIncoming( msg )
-
+        
         return msg
     end
     
+    def RServiceBus.tick( string )
+        puts "[TICK] #{Time.new.strftime( '%Y-%m-%d %H:%M:%S.%6N' )} :: #{caller[0]}. #{string}"
+    end
+    
+    
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rservicebus
 version: !ruby/object:Gem::Version
-  version: 0.1.50
+  version: 0.1.52
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-22 00:00:00.000000000 Z
+date: 2013-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uuidtools
-  requirement: &70133843560180 !ruby/object:Gem::Requirement
+  requirement: &70143409829480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70133843560180
+  version_requirements: *70143409829480
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70133843559720 !ruby/object:Gem::Requirement
+  requirement: &70143409820780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70133843559720
+  version_requirements: *70143409820780
 - !ruby/object:Gem::Dependency
   name: beanstalk-client
-  requirement: &70133843559240 !ruby/object:Gem::Requirement
+  requirement: &70143409819540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70133843559240
+  version_requirements: *70143409819540
 - !ruby/object:Gem::Dependency
   name: fluiddb
-  requirement: &70133843558660 !ruby/object:Gem::Requirement
+  requirement: &70143409818280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70133843558660
+  version_requirements: *70143409818280
 - !ruby/object:Gem::Dependency
   name: parse-cron
-  requirement: &70133843558140 !ruby/object:Gem::Requirement
+  requirement: &70143409815500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70133843558140
+  version_requirements: *70143409815500
 description: A Ruby interpretation of NServiceBus
 email: guy@guyirvine.com
 executables: