lib/liquid/server.rb in liquid-ext-3.3.7 vs lib/liquid/server.rb in liquid-ext-3.3.8

@@ -4,10 +4,12 @@
 module Liquid
   class Server
     def initialize
       $log.info("#{self.class.name.downcase} #{RUBY_DESCRIPTION}")
       $log.info("#{self.class.name.downcase}", env: Env.mode)
+      Signal.register_shutdown_handler { System.exit(0) }
+      Signal.register_shutdown_handler { ZContext.destroy }
       initialize_raven
       initialize_tracker
       initialize_metrics
       initialize_health_checks
     end
@@ -54,10 +56,9 @@
     def initialize_zmachine
       require 'zmachine'
       ZMachine.logger = $log
       ZMachine.debug = true if $conf.zmachine.debug
       ZMachine.heartbeat_interval = 0.1
-      Signal.register_shutdown_handler { ZMachine.stop }
     end
 
     def run
       # by default wait for all workers
       Thread.join