fluent-plugin-irc 0.0.3 → 0.0.4

data/fluent-plugin-irc.gemspec

@@ -3,9 +3,9 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "fluent-plugin-irc"
-  s.version     = "0.0.3"
+  s.version     = "0.0.4"
   s.authors     = ["OKUNO Akihiro"]
-  s.email       = ["okuno.akihiro@gmail.com"]
+  s.email       = ["choplin.choplin@gmail.com"]
   s.homepage    = "https://github.com/choplin/fluent-plugin-irc"
   s.summary     = %q{Output plugin for IRC}
   s.description = %q{Output plugin for IRC}

data/lib/fluent/plugin/out_irc.rb

@@ -40,38 +40,49 @@ module Fluent
 
     def start
       super
+
       begin
-        @client = IRCConnection.connect(@host, @port)
+        @conn = create_connection
       rescue
         raise Fluent::ConfigError, "failto connect IRC server #{@host}:#{@port}"
       end
-
-      @client.channel = '#'+@channel
-      @client.nick = @nick
-      @client.user = @user
-      @client.real = @real
-      @client.password = @password
-      @client.attach(Coolio::Loop.default)
     end
 
     def shutdown
       super
-      @client.close
+      @conn.close unless @conn.closed?
     end
 
     def emit(tag, es, chain)
       chain.next
+
+      if @conn.closed?
+        refresh_connection(@conn)
+      end
+
       es.each do |time,record|
         filter_record(tag, time, record)
-        IRCParser.message(:priv_msg) do |m|
-          m.target = @client.channel
-          m.body = build_message(record)
-          @client.send m
-        end
+        @conn.send_message(build_message(record))
       end
     end
 
     private
+
+    def create_connection
+      conn = IRCConnection.connect(@host, @port)
+      conn.channel = '#'+@channel
+      conn.nick = @nick
+      conn.user = @user
+      conn.real = @real
+      conn.password = @password
+      conn.attach(Coolio::Loop.default)
+      conn
+    end
+
+    def refresh_connection(conn)
+      conn = create_connection
+    end
+
     def build_message(record)
       values = @out_keys.map do |key|
         begin
@@ -106,10 +117,6 @@ module Fluent
         end
       end
 
-      def on_close
-        #TODO
-      end
-
       def on_read(data)
         data.each_line do |line|
           begin
@@ -133,16 +140,12 @@ module Fluent
         end
       end
 
-      def on_resolve_failed
-        #TODO
-      end
-
-      def on_connect_failed
-        #TODO
-      end
-
-      def send(msg)
-        write msg
+      def send_message(msg)
+        IRCParser.message(:priv_msg) do |m|
+          m.target = @channel
+          m.body = msg
+          write m
+        end
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-irc
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-24 00:00:00.000000000 Z
+date: 2013-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -45,7 +45,7 @@ dependencies:
         version: '0'
 description: Output plugin for IRC
 email:
-- okuno.akihiro@gmail.com
+- choplin.choplin@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []