Merge pull request #2881 from ganmacs/add-test-suit

test: skip if error is occured
fluent · Mar 13, 2020 · eb9c49e · eb9c49e
2 parents 0bfde48 + b6fb848
commit eb9c49e
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/lib/fluent/plugin/sd_file.rb b/lib/fluent/plugin/sd_file.rb
@@ -85,6 +85,7 @@ def refresh_file(queue)
             fetch_server_info
           rescue => e
             @log.error("sd_file: #{e}")
+            return
           end
 
         if s.nil?

diff --git a/test/plugin/test_sd_file.rb b/test/plugin/test_sd_file.rb
@@ -149,6 +149,23 @@ def create_tmp_config(path, body)
       assert_empty queue
     end
 
+    test 'Skip if error is occured' do
+      @sd_file.extend(TestStatEventHelperWrapper)
+
+      create_tmp_config('config.json', JSON.generate([{ port: 1233, host: '127.0.0.1' }]))
+      @sd_file.configure(config_element('service_discovery', '', { 'path' => File.join(@dir, 'config.yml') }))
+      queue = []
+
+      FileUtils.rm_r(File.join(@dir, 'tmp', 'config.json'))
+      mock.proxy(@sd_file).refresh_file(queue).twice
+
+      @sd_file.start(queue)
+      assert_empty queue
+
+      @sd_file.resume
+      assert_empty queue
+    end
+
     test 'if service is updated, service_in and service_out event happen' do
       @sd_file.extend(TestStatEventHelperWrapper)