out_forward: Support dns round robin

mr-salty · Jul 1, 2015 · 1c1a0fb · 1c1a0fb
1 parent 6002b9b
commit 1c1a0fb
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 4 deletions.
diff --git a/example/in_forward.conf b/example/in_forward.conf
@@ -0,0 +1,7 @@
+<source>
+  type forward
+</source>
+
+<match test>
+  type stdout
+</match>
diff --git a/example/out_forward.conf b/example/out_forward.conf
@@ -1,24 +1,29 @@
 <source>
-  type forward
+  type dummy
+  tag test
 </source>
 
 <match test>
   type forward
 
   <server>
     # first server
+    host localhost
     port 24224
   </server>
   <server>
     # second server
+    host localhost
     port 24225
   </server>
   <server>
     # second server
+    host localhost
     port 24226
     standby
   </server>
 
+  flush_interval 1
   send_timeout 60
   heartbeat_type udp
   heartbeat_interval 1

diff --git a/lib/fluent/load.rb b/lib/fluent/load.rb
@@ -1,5 +1,6 @@
 require 'thread'
 require 'socket'
+require 'resolv'
 require 'fcntl'
 require 'time'
 require 'monitor'

diff --git a/lib/fluent/plugin/out_forward.rb b/lib/fluent/plugin/out_forward.rb
@@ -460,9 +460,8 @@ def resolved_host
       end
 
       def resolve_dns!
-        @sockaddr = Socket.pack_sockaddr_in(@port, @host)
-        port, resolved_host = Socket.unpack_sockaddr_in(@sockaddr)
-        return resolved_host
+        # shuffle to support dns round robin
+        Resolv.getaddresses(@host).shuffle!.first
       end
       private :resolve_dns!