service_skeleton 0.0.0.16.g99ff4d7 → 0.0.0.20.gb9a0460

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9fe5415554536e557f6666ea6fde587d417a3f98878194949f48037c13b876e1
-  data.tar.gz: 9606acf330ed46324bbe1f39066844463e82f34ee2ec6b979ccd04fc54dcd8c7
+  metadata.gz: 651f874d0096f67e63ff46f957125c53b032861d34b6b43cfdfb2113eca7ad65
+  data.tar.gz: 78c72f06cb3693d10d9c02338191eb0fef4a8171a97a138c01c42374133ecef6
 SHA512:
-  metadata.gz: 72494f036549c13931e2d8ad6d3928e2bf8db14b10da2e9007ce3d10ebb8d54d84c316cc3fbbde4de26e234ecc5fbb0a894d73ebab54cabbd28626b3f43e1333
-  data.tar.gz: acde5210642f771083ffa5406066b53c8ff5eddc06281567fd45cb45a4b0b85c2add07101c5ed5727ee7959563b07538ad97e8fac1f2db27791e2dd3a0a6b1df
+  metadata.gz: 59635704ca571789796e46449916154cbcc4194e39a6bf754c564490e7acd4a3217e32693090920b8c5195672f6d602426e85b80f52fec5bc9d6f4d3dd2c6f35
+  data.tar.gz: b67dd4d48fe6c468f10b7e34deb54195eee9f55e460f8179714228f727e5ff941f1200347825e8108fdb17ccd97da0b00d53431adb887b7ac37ee941ad3bd55d

data/.editorconfig

@@ -0,0 +1,7 @@
+[*.rb]
+indent_style = space
+indent_size = 2
+end_of_line = lf
+insert_final_newline = true
+charset = utf-8
+trim_trailing_whitespace = true

data/lib/service_skeleton/background_worker.rb

@@ -54,15 +54,24 @@ class ServiceSkeleton
       end
     end
 
-    def stop!
+    def stop!(force = nil)
       @bg_worker_op_mutex.synchronize do
         return if @bg_worker_thread.nil?
 
-        logger.debug("BackgroundWorker(#{self.class})#stop!") { "Terminating worker thread #{Thread.current.object_id} as requested" }
+        logger.debug("BackgroundWorker(#{self.class})#stop!") { "Terminating worker thread #{@bg_worker_thread.object_id} as requested" }
 
-        shutdown
+        if force == :force
+          @bg_worker_thread.raise(TerminateBackgroundThread)
+        else
+          shutdown
+        end
+
+        begin
+          @bg_worker_thread.join unless @bg_worker_thread == Thread.current
+        rescue TerminateBackgroundThread
+          nil
+        end
 
-        @bg_worker_thread.join
         @bg_worker_thread = nil
 
         logger.debug("BackgroundWorker(#{self.class})#stop!") { "Worker thread terminated" }

data/lib/service_skeleton/signal_handler.rb

@@ -42,6 +42,8 @@ class ServiceSkeleton
 
       @signal_registry = []
 
+      @handler_install_mutex = Mutex.new
+
       super
     end
 
@@ -62,16 +64,18 @@ class ServiceSkeleton
     #   specifier by `Signal.trap`.
     #
     def hook_signal(sig, &blk)
-      @bg_worker_op_mutex.synchronize do
-        handler_num = @signal_registry.length
+      logger.debug(logloc) { "Hooking signal #{sig}" }
 
-        if handler_num > 255
-          raise RuntimeError,
-                "Signal hook limit reached.  Slow down there, pardner"
-        end
+      handler_num = @signal_registry.length
 
-        sigspec = { signal: sig, callback: blk }
+      if handler_num > 255
+        raise RuntimeError,
+              "Signal hook limit reached.  Slow down there, pardner"
+      end
 
+      sigspec = { signal: sig, callback: blk }
+
+      @handler_install_mutex.synchronize do
         if @bg_worker_thread
           install_handler(sigspec, handler_num)
         else
@@ -84,11 +88,13 @@ class ServiceSkeleton
     end
 
     def start
-      logger.info(logloc) { "Starting signal handler with #{@signal_registry.length} hooks" }
+      @handler_install_mutex.synchronize do
+        logger.info(logloc) { "Starting signal handler with #{@signal_registry.length} hooks" }
 
-      @r, @w = IO.pipe
+        @r, @w = IO.pipe
 
-      install_signal_handlers
+        install_signal_handlers
+      end
 
       loop do
         begin
@@ -99,6 +105,7 @@ class ServiceSkeleton
                 break
               else
                 c = ios.first.first.read_nonblock(1)
+                logger.debug(logloc) { "Received character #{c.inspect} from signal pipe" }
                 handle_signal(c)
               end
             else
@@ -146,6 +153,7 @@ class ServiceSkeleton
     end
 
     def install_handler(sigspec, i)
+      logger.debug(logloc) { "Installing signal handler for #{sigspec[:signal]}" }
       chain = nil
 
       p = ->(*args) do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: service_skeleton
 version: !ruby/object:Gem::Version
-  version: 0.0.0.16.g99ff4d7
+  version: 0.0.0.20.gb9a0460
 platform: ruby
 authors:
 - Matt Palmer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-27 00:00:00.000000000 Z
+date: 2019-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: frankenstein
@@ -261,6 +261,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".editorconfig"
 - ".gitignore"
 - ".rubocop.yml"
 - ".travis.yml"