rflow-components-irc 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b8ae275a388d2064aec32bd1b4719e90b85ddcb
-  data.tar.gz: af5047c95d9b66976db8a30841256302ae91aea0
+  metadata.gz: a278a2b1cbefadcddb0b5425906e8ae62bfe1702
+  data.tar.gz: 3504f90b41efd1b92c9bd535086957303b5be865
 SHA512:
-  metadata.gz: 3b501eee9dcaf1500c1a9a75630c522defa352d72da64f009ca136ed62e5b51f88c6bf26d267fa3662ba8c5e7d7189eec08196928b72c26413c86ebc365f59f6
-  data.tar.gz: e61046b0164b4a7d10289229030093c39980aeb3850c7a762ef9cc4f1c10a0048650aa86dc4ab6f5aafa3836749b7076935aa169a0a368a89a4280c4853d3b5c
+  metadata.gz: 8afebdd4b908e95a83d3bb8935f6bf377f768003a40e0bc8a28a163f423a601ced2c2be7a8873545dacba6a099fe6ebf584df3671d94186bae0401e924fca662
+  data.tar.gz: c94e513b3cb974adf5ed6145e295d7823876cf2ed67b9a31adc6807a50f2a1c49821955dcb0673aa3134782bcc724bbe7b7176d626b46d358f5817ccdc139538

data/lib/rflow/components/irc/client.rb

@@ -42,26 +42,27 @@ class RFlow
         def run!
           @client_connection = EM.connect(@server, @port, Connection) do |conn|
             conn.client = self
+            RFlow.logger.debug { "#{name}: Connection from #{@client_ip}:#{@client_port} to #{@server_ip}:#{@server_port}" }
           end
         end
 
         def process_message(input_port, input_port_key, connection, message)
-          RFlow.logger.debug "Received a message"
+          RFlow.logger.debug { "#{name}: Received a message" }
           return unless message.data_type_name == 'RFlow::Message::Data::IRC::Message'
 
           if config['promiscuous']
-            RFlow.logger.debug "Received an IRC::Message message, sending to client connection"
+            RFlow.logger.debug { "#{name}: Received an IRC::Message message, sending to client connection" }
             client_connection.send_irc_message message
           else
-            RFlow.logger.debug "Received an IRC::Message message, determining if its mine"
+            RFlow.logger.debug { "#{name}: Received an IRC::Message message, determining if it's mine" }
             my_events = message.provenance.find_all {|event| event.component_instance_uuid == instance_uuid}
-            RFlow.logger.debug "Found #{my_events.size} processing events from me"
+            RFlow.logger.debug { "#{name}: Found #{my_events.size} processing events from me" }
             # Attempt to send the data to each context match.
             # TODO: check for correctness
             my_events.each do |event|
-              RFlow.logger.debug "Inspecting context #{client_connection.signature.to_s} == #{event.context.to_s}"
+              RFlow.logger.debug { "#{name}: Inspecting context #{client_connection.signature.to_s} == #{event.context.to_s}" }
               if client_connection.signature.to_s == event.context.to_s
-                RFlow.logger.debug "Found connection for #{event.context}, sending message to associated client connection"
+                RFlow.logger.debug { "#{name}: Found connection for #{event.context}, sending message to associated client connection" }
                 client_connection.send_irc_message message
               end
             end
@@ -77,7 +78,6 @@ class RFlow
           def post_init
             @client_port, @client_ip = Socket.unpack_sockaddr_in(get_peername) rescue ["?", "?.?.?.?"]
             @server_port, @server_ip = Socket.unpack_sockaddr_in(get_sockname) rescue ["?", "?.?.?.?"]
-            RFlow.logger.debug "Connection from #{@client_ip}:#{@client_port} to #{@server_ip}:#{@server_port}"
             super
           end
 
@@ -85,7 +85,7 @@ class RFlow
             @reconnecting = false
             @connected = true
 
-            RFlow.logger.info("Connected to IRC server #{client.config['server']}:#{client.config['port']}")
+            RFlow.logger.info "#{client.name}: Connected to IRC server #{client.config['server']}:#{client.config['port']}"
 
             command "PASS", [client.config['server_password']] unless client.config['server_password'].nil?
             command "NICK", [client.config['nickname']]
@@ -95,7 +95,7 @@ class RFlow
           end
 
           def receive_line(line)
-            RFlow.logger.debug("IRCClient#receive_line: #{line}")
+            RFlow.logger.debug { "#{client.name}: IRCClient#receive_line: #{line}" }
             prefix, cmd, params = IRC.parse_irc_line(line)
 
             # Now have an optional prefix, required cmd, and optional param array
@@ -104,7 +104,7 @@ class RFlow
               command('PONG', params)
             else
               # create an IRC message here and send it along
-              RFlow.logger.debug("Sending IRC message '#{line}', signature '#{signature.class}:#{signature}', '#{signature.to_s.class}:#{signature.to_s}'")
+              RFlow.logger.debug { "#{client.name}: Sending IRC message '#{line}', signature '#{signature.class}:#{signature}', '#{signature.to_s.class}:#{signature.to_s}'" }
 
               client.from_server.send_message(RFlow::Message.new('RFlow::Message::Data::IRC::Message').tap do |m|
                 m.data.prefix = prefix
@@ -120,9 +120,9 @@ class RFlow
 
           def unbind(reason = nil)
             if @connected || @reconnecting
-              RFlow.logger.error("Disconnected from IRC server #{client.config['server']}:#{client.config['port']} due to '#{reason}', reconnecting ...")
+              RFlow.logger.error "#{client.name}: Disconnected from IRC server #{client.config['server']}:#{client.config['port']} due to '#{reason}', reconnecting ..."
               EM.add_timer(client.config['reconnect_interval']) do
-                RFlow.logger.error "Attempting reconnect to IRC server #{client.config['server']}:#{client.config['port']}"
+                RFlow.logger.error "#{client.name}: Attempting reconnect to IRC server #{client.config['server']}:#{client.config['port']}"
                 reconnect(client.config['server'], client.config['port'])
               end
               @connected = false
@@ -133,17 +133,17 @@ class RFlow
           end
 
           def send_irc_message(irc_message)
-            RFlow.logger.debug "Sending an IRC message to #{client_ip}:#{client_port}"
+            RFlow.logger.debug { "#{client.name}: Sending an IRC message to #{client_ip}:#{client_port}" }
             command irc_message.data.command, irc_message.data.parameters, irc_message.data.prefix
           end
 
           def send_irc_line(line)
-            RFlow.logger.debug "Sending line '#{line}'"
+            RFlow.logger.debug { "#{client.name}: Sending line '#{line}'" }
             send_data "#{line}\r\n"
           end
 
           def command(cmd, args = [], prefix = nil)
-            RFlow.logger.debug("command: '#{cmd}' with args ['#{args.join("', '")}'] and prefix '#{prefix}'")
+            RFlow.logger.debug { "#{client.name}: command: '#{cmd}' with args ['#{args.join("', '")}'] and prefix '#{prefix}'" }
             line = ''
             if prefix
               line << ":#{prefix} "

data/lib/rflow/components/irc/version.rb

@@ -1,7 +1,7 @@
 class RFlow
   module Components
     module IRC
-      VERSION = "1.0.0"
+      VERSION = "1.0.1"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rflow-components-irc
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Michael L. Artz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-30 00:00:00.000000000 Z
+date: 2014-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rflow