vidibus-recording 2.0.1 → 2.0.2

data/lib/vidibus/recording/mongoid.rb

@@ -44,8 +44,7 @@ module Vidibus::Recording
       if time == :now
         self.started_at = Time.now
         self.active = true
-        start_worker
-        save!
+        start!
       else
         schedule(time)
       end
@@ -57,8 +56,7 @@ module Vidibus::Recording
       self.stopped_at = nil
       self.failed_at = nil
       self.active = true
-      start_worker
-      save!
+      start!
     end
 
     # Resets data and starts anew.
@@ -71,34 +69,37 @@ module Vidibus::Recording
     # Stops the recording worker and starts postprocessing.
     def stop
       return false if done? || !started?
-      stop_worker
-      self.pid = nil
-      self.stopped_at = Time.now
-      self.running = false
-      self.active = false
-      postprocess
+      stop_worker do
+        self.pid = nil
+        self.stopped_at = Time.now
+        self.running = false
+        self.active = false
+        postprocess
+      end
     end
 
     # Gets called from recording worker if it receives no more data.
-    def halt(msg = nil)
+    def halt
       return false unless running?
-      stop_worker
-      self.pid = nil
-      self.running = false
-      postprocess
+      stop_worker do
+        self.pid = nil
+        self.running = false
+        postprocess
+      end
     end
 
     # Receives an error from recording worker and stores it.
     # The worker gets stopped and postprocessing is started.
     def fail(msg)
       return false unless running?
-      stop_worker
-      self.pid = nil
-      self.error = msg
-      self.failed_at = Time.now
-      self.running = false
-      self.active = false
-      postprocess
+      stop_worker do
+        self.pid = nil
+        self.error = msg
+        self.failed_at = Time.now
+        self.running = false
+        self.active = false
+        postprocess
+      end
     end
 
     # TODO: really a public method?
@@ -161,11 +162,15 @@ module Vidibus::Recording
     # Returns true if recording worker is still running.
     # Persists attributes accordingly.
     def worker_running?
-      if worker.running?
-        update_attributes(:running => true) unless running?
+      if fresh_worker.running?
+        unless running?
+          self.update_attributes!(:running => true)
+        end
         true
       else
-        update_attributes(:pid => nil, :running => false)
+        if running?
+          self.update_attributes!(:pid => nil, :running => false)
+        end
         false
       end
     end
@@ -225,13 +230,43 @@ module Vidibus::Recording
     def start_worker
       return if worker_running?
       setup_next_part
-      worker.start
+      fresh_worker.start
+    end
+
+    def ensure_pid
+      unless worker.pid
+        fail('Worker did not return a PID!') and return
+      end
+      unless self.reload.pid == worker.pid
+        fail('Worker PID could not be stored!') and return
+      end
+    end
+
+    def start!
+      start_worker
       self.running = true
       self.pid = worker.pid
+      save!
+      ensure_pid
+    end
+
+    # Stop worker and then call block.
+    # If this method is invoked (indirectly) by a running worker process
+    # the block is called before exiting the process.
+    def stop_worker(&block)
+      worker = fresh_worker
+      if worker.pid = Process.pid
+        block.call
+        worker.stop
+      else
+        worker.stop
+        block.call
+      end
     end
 
-    def stop_worker
-      worker.stop
+    def fresh_worker
+      @worker = nil
+      worker
     end
 
     def setup_next_part

data/lib/vidibus/recording/version.rb

@@ -1,5 +1,5 @@
 module Vidibus
   module Recording
-    VERSION = '2.0.1'
+    VERSION = '2.0.2'
   end
 end

data/lib/vidibus/recording/worker.rb

@@ -113,12 +113,33 @@ module Vidibus::Recording
 
     def fail(msg)
       log("ERROR: #{msg}", true)
-      recording.reload.fail(msg)
+      with_fresh_recording do |recording|
+        recording.fail(msg)
+        exit!
+      end
     end
 
     def halt(msg)
       log("HALT: #{msg}", true)
-      recording.reload.halt(msg)
+      with_fresh_recording do |recording|
+        recording.halt
+        exit!
+      end
+    end
+
+    def with_fresh_recording(&block)
+      rec = recording.reload # reload to get fresh object
+      if rec.pid == Process.pid
+        block.call(rec)
+      else
+        exit!
+      end
+    end
+
+    def exit!
+      self.pid = Process.pid
+      stop
+      exit
     end
 
     def extract_metadata(string)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vidibus-recording
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-13 00:00:00.000000000 Z
+date: 2013-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -197,7 +197,8 @@ files:
 - README.md
 - Rakefile
 homepage: https://github.com/vidibus/vidibus-recording
-licenses: []
+licenses:
+- MIT
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -210,7 +211,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 432343217845410671
+      hash: 876306069205502720
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: