service_skeleton 0.0.0.30.g32b8169 → 0.0.0.34.g4f6fdb0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c73ba4e02f8bcd6f90caa188e15b3da3bd3fef747a30f8da70ac12881177c179
-  data.tar.gz: a1e1f008182f70f135c7455725d2e1bf4a7515789512786b2aa58c914bed9299
+  metadata.gz: 8e45890d70da0bc9118d5b96a8d697197cfd05fb6463ff3e84f048ceb4246b55
+  data.tar.gz: bb5bafb7ce4cd3e68143fbb179fd630cec02e9c2b1587afa7a601513efb826a1
 SHA512:
-  metadata.gz: ee7d4bb7bb7f1b84f37fb3d63bc698e632dcad00eaa98e886628106d3966d57ce950499696ea04628fb09f8e1de9b6242069486fc0669be2413278dcf6c8f744
-  data.tar.gz: 5d75bab29a82cd40083fde69a2d9725273475a45e922d68e2b3b88300215fc3ec0dfea08fa441556235fe48a0879fe5cbff037cf407debd9a3efd5f2710c18aa
+  metadata.gz: 68f83da9df7a513d4664c94c01f6c48102012f6b8de6cf89641f48f617441e23d9ffdd408a879f9ca17a39e2debeed55750265b6ee03a16210e66a9d730adb5f
+  data.tar.gz: 64ddeaacdb65c61af8c745a4b2acb30857c3481641530e1968d29cf6aea0b29a341ff16d00259d05b8529793012da3b0eda9abd2c82e9b5e3f1a45cfe51f589f

data/README.md

@@ -75,6 +75,8 @@ Whatever it is, `ServiceSkeleton` doesn't discriminate.  All you have to do is
 write it in your subclass' `#run` method, and `ServiceSkeleton` will take care
 of the rest.
 
+If your `#run` method exits, the service will terminate.
+
 
 ### STAHP!
 

data/lib/service_skeleton/background_worker.rb

@@ -48,6 +48,7 @@ class ServiceSkeleton
               logger.debug("BackgroundWorker(#{self.class})#start!") { "Background worker thread #{Thread.current.object_id} terminating" }
             end
           end
+          logger.debug("BackgroundWorker(#{self.class})#start!") { "Background worker thread #{Thread.current.object_id} is now done" }
         end
 
         @bg_worker_op_cv.wait(@bg_worker_op_mutex) until @bg_worker_thread
@@ -61,12 +62,15 @@ class ServiceSkeleton
         logger.debug("BackgroundWorker(#{self.class})#stop!") { "Terminating worker thread #{@bg_worker_thread.object_id} as requested" }
 
         if force == :force
+          logger.debug(logloc) { "Forcing termination" }
           @bg_worker_thread.raise(TerminateBackgroundThread)
         else
+          logger.debug(logloc) { "Gracefully terminating worker thread" }
           shutdown
         end
 
         begin
+          logger.debug(logloc) { "Waiting for worker thread #{@bg_worker_thread.object_id} to finish itself off" }
           @bg_worker_thread.join unless @bg_worker_thread == Thread.current
         rescue TerminateBackgroundThread
           nil
@@ -74,7 +78,7 @@ class ServiceSkeleton
 
         @bg_worker_thread = nil
 
-        logger.debug("BackgroundWorker(#{self.class})#stop!") { "Worker thread terminated" }
+        logger.debug("BackgroundWorker(#{self.class})#stop!") { "Worker thread #{@bg_worker_thread.object_id} terminated" }
       end
     end
 
@@ -83,7 +87,8 @@ class ServiceSkeleton
     attr_reader :logger
 
     def shutdown
-      @bg_worker_thread.raise(TerminateBackgroundThread)
+      logger.debug("BackgroundWorker(#{self.class})#stop!") { "Using default shutdown method" }
+      @bg_worker_thread.raise(TerminateBackgroundThread) if @bg_worker_thread
     end
   end
 end

data/lib/service_skeleton/config.rb

@@ -75,7 +75,7 @@ class ServiceSkeleton
         th_n = thread_id_map[Thread.current.object_id] || (thread_id_map[Thread.current.object_id] = thread_id_map.length)
 
         ts = log_enable_timestamps ? "#{t.utc.strftime("%FT%T.%NZ")} " : ""
-        "#{ts}##{th_n} #{s[0]} [#{p}] #{m}\n"
+        "#{ts}#{$$}##{th_n} #{s[0]} [#{p}] #{m}\n"
       end
 
       @logger.filters = []

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: service_skeleton
 version: !ruby/object:Gem::Version
-  version: 0.0.0.30.g32b8169
+  version: 0.0.0.34.g4f6fdb0
 platform: ruby
 authors:
 - Matt Palmer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-04 00:00:00.000000000 Z
+date: 2019-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: frankenstein