revert - prefer rescuing StandardError over Exception

Signed-off-by: shubhendra <[email protected]>

Author: withshubh

lib/fluent/engine.rb

@@ -152,7 +152,7 @@ def run
         sleep MAINLOOP_SLEEP_INTERVAL until @engine_stopped
         $log.info "fluentd worker is now stopping", worker: worker_id
 
-      rescue StandardError => e
+      rescue Exception => e
         $log.error "unexpected error", error: e
         $log.error_backtrace
         raise

lib/fluent/plugin/multi_output.rb

@@ -95,7 +95,7 @@ def call_lifecycle_method(method_name, checker_name)
           begin
             log.debug "calling #{method_name} on output plugin dynamically created", type: Fluent::Plugin.lookup_type_from_class(o.class), plugin_id: o.plugin_id
             o.__send__(method_name) unless o.__send__(checker_name)
-          rescue StandardError => e
+          rescue Exception => e
             log.warn "unexpected error while calling #{method_name} on output plugin dynamically created", plugin: o.class, plugin_id: o.plugin_id, error: e
             log.warn_backtrace
           end

lib/fluent/plugin_helper/thread.rb

@@ -77,7 +77,7 @@ def thread_create(title)
           begin
             yield
             thread_exit = true
-          rescue StandardError => e
+          rescue Exception => e
             log.warn "thread exited by unexpected error", plugin: self.class, title: title, error: e
             thread_exit = true
             raise

lib/fluent/root_agent.rb

@@ -238,7 +238,7 @@ def shutdown # Fluentd's shutdown sequence is stop, before_shutdown, shutdown, a
           begin
             log.debug "calling #{method} on #{kind} plugin", type: Plugin.lookup_type_from_class(instance.class), plugin_id: instance.plugin_id
             instance.__send__(method) unless instance.__send__(checker)
-          rescue StandardError => e
+          rescue Exception => e
             log.warn "unexpected error while calling #{method} on #{kind} plugin", plugin: instance.class, plugin_id: instance.plugin_id, error: e
             log.warn_backtrace
           end
@@ -268,7 +268,7 @@ def shutdown # Fluentd's shutdown sequence is stop, before_shutdown, shutdown, a
                 log.debug "#{operation} #{kind} plugin", type: Plugin.lookup_type_from_class(instance.class), plugin_id: instance.plugin_id
                 begin
                   instance.__send__(:before_shutdown) unless instance.__send__(:before_shutdown?)
-                rescue StandardError => e
+                rescue Exception => e
                   log.warn "unexpected error while #{operation} on #{kind} plugin", plugin: instance.class, plugin_id: instance.plugin_id, error: e
                   log.warn_backtrace
                 end
@@ -279,7 +279,7 @@ def shutdown # Fluentd's shutdown sequence is stop, before_shutdown, shutdown, a
                 log.debug "#{operation} #{kind} plugin", type: Plugin.lookup_type_from_class(instance.class), plugin_id: instance.plugin_id
                 instance.__send__(method) unless instance.__send__(checker)
               end
-            rescue StandardError => e
+            rescue Exception => e
               log.warn "unexpected error while #{operation} on #{kind} plugin", plugin: instance.class, plugin_id: instance.plugin_id, error: e
               log.warn_backtrace
             end

lib/fluent/supervisor.rb

@@ -673,7 +673,7 @@ def options
     def run_worker
       begin
         require 'sigdump/setup'
-      rescue StandardError
+      rescue Exception
         # ignore LoadError and others (related with signals): it may raise these errors in Windows
       end
 
@@ -893,7 +893,7 @@ def flush_buffer
           @log.reopen!
           Fluent::Engine.flush!
           $log.debug "flushing thread: flushed"
-        rescue StandardError => e
+        rescue Exception => e
           $log.warn "flushing thread error: #{e}"
         end
       end

lib/fluent/winsvc.rb

@@ -98,6 +98,6 @@ def set_event(event_name)
 
   FluentdService.new(opts[:service_name]).mainloop
 
-rescue StandardError => err
+rescue Exception => err
   raise
 end