daemon_runner 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a40696f28e6af1d205de21719f33bcd617b3a6a
-  data.tar.gz: 72d29ef5129936ee5a64c0f159b32db2966f5a32
+  metadata.gz: 8f9b54559e80630efbf1a6a5b6f459888cd296f9
+  data.tar.gz: a7f763bdc385cc88ee530550476d9c4baf1a3cd3
 SHA512:
-  metadata.gz: 05d11eb3122cd995603c1e21b0d66af72a467dfac4cf1a701e32260744eb09d6dc808a966a17547024d08d685ef5306a9391fc937bd906ffed6465ad1c4f0272
-  data.tar.gz: 0f2202f3091650a471edab3567a51fa7b1f76b9dd2f2147f701c38fc41f62625910e4be0ce7278d8350839e0d5ca29d2e82e9ee3958da188b426d33067395eff
+  metadata.gz: ed46495953d0fdb759470475c3f25b97428be13a3c25f391a3b3271d18ffd808e69ff2b79dfd949be36b6ca649c436f4413c1dc2dd78ca3a9244b126a861ca85
+  data.tar.gz: 332319f3d280c60481831f5a1d4e8abe0059517bb4bb79bd19d6cb508521f6b9f43b28c1b5300ebc7843432a0016f83d25f1366f8cfc4cbb72a4624b199c1d5f

data/README.md

@@ -168,7 +168,7 @@ Locking can be done either via an exclusive lock or a semaphore lock.  The major
 **TBD**
 
 #### Semaphore Lock
-For an example of how to implement semaphore locking take a look at the [example](/examples/example_semaphore.rb)
+For an example of how to implement semaphore locking take a look at the [manual locking example](/examples/example_semaphore.rb) and the [slightly more automatic version](/examples/example_semaphore_release.rb).
 
 
 ## Development

data/examples/example_semaphore.rb

@@ -5,7 +5,27 @@ require 'dev/consul'
 
 @service = 'myservice'
 @lock_count = 3
-@locked = false
+@lock_time = 10
 
-@semaphore = DaemonRunner::Semaphore.start(@service)
-DaemonRunner::Semaphore.lock(@lock_count)
+::Dev::Consul.run
+::Dev::Consul.wait
+
+# Get a new semaphore
+@semaphore = DaemonRunner::Semaphore.lock(@service, @lock_count)
+
+# Spawn a thread to handle renewing the lock
+@renew_thread = @semaphore.renew
+
+# Do whatever kind of work you want
+@lock_time.downto(0).each do |i|
+  puts "Releasing lock in #{i} seconds"
+  sleep 1
+end
+
+# Kill the thread when you're done
+@renew_thread.kill
+
+# Explicitly release the semaphore when you're done
+@semaphore.release
+
+::Dev::Consul.stop

data/examples/example_semaphore_release.rb

@@ -5,12 +5,16 @@ require 'dev/consul'
 
 @service = 'myreleaseservice'
 @lock_count = 3
-@locked = false
 @lock_time = 10
 
+::Dev::Consul.run
+::Dev::Consul.wait
+
 DaemonRunner::Semaphore.lock(@service, @lock_count) do
   @lock_time.downto(0).each do |i|
    puts "Releasing lock in #{i} seconds"
    sleep 1
   end
 end
+
+::Dev::Consul.stop

data/lib/daemon_runner/semaphore.rb

@@ -19,17 +19,19 @@ module DaemonRunner
         semaphore = Semaphore.new(options)
         semaphore.lock
         if block_given?
-          lock_thr = semaphore.renew
-          yield
+          begin
+            lock_thr = semaphore.renew
+            yield
+          ensure
+            lock_thr.kill unless lock_thr.nil?
+            semaphore.release
+          end
         end
         semaphore
       rescue Exception => e
         logger.error e
         logger.debug e.backtrace.join("\n")
         raise
-      ensure
-        lock_thr.kill
-        semaphore.release
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: daemon_runner
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Andrew Thompson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-11-15 00:00:00.000000000 Z
+date: 2016-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logging