crabfarm 0.0.14 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5ffa69cbe5f984ef8f3d348bcec410f1676f8409
-  data.tar.gz: 9f496ef1a4bd75caa56fac8c26ef24b69a284acc
+  metadata.gz: f9c3775845087acaaa1cc6a8ba773a034d52e8ed
+  data.tar.gz: 78156359fc8d036ad54a591be1923ac96eb5aa72
 SHA512:
-  metadata.gz: 976296a79fa1281b7415ec823b9e4c1e8c01d8f9280d13f382c507cba69f64a26c508f0bd9fccae7eb4d377101066cc66b33673939eb04e6133d33591658d468
-  data.tar.gz: 6d0cca01d8dc9bef52d888c72f6af1a3e623f14df75913b16c946db9fa86d67f9a3d883fec7c85eef30ff80f10e529e1a20f819f4bad76ba3383db99cd47bdff
+  metadata.gz: f4aa1971119f25c19a1bae8f606464cc20e0025a02b02ea960749b22ed3602acb6d69b4a58dfa4af18851ecfacba528646b2fc0c6bb4cd8b0c8a8239bd6f9f07
+  data.tar.gz: d7ecd4359f474d94b109a62b48f35e2af394d3aa0aad62e27d8ef6ac3f00f99037897c56f68fc285470dfa72c14246f3d6e1219d9be71efd05a470bb54950c4f

data/lib/crabfarm/engines/safe_state_loop.rb

@@ -5,17 +5,36 @@ module Crabfarm
   module Engines
     class SafeStateLoop
 
+      class LoopAbortedException < StandardError; end
+
       def initialize
-        @running = true
         @working = false
         @fatal = nil
         @lock = Mutex.new
-        @thread = Thread.new { crawl_loop }
       end
 
-      def release
-        @running = false
-        @thread.join
+      def start
+        @lock.synchronize {
+          if @thread.nil?
+            @fatal = nil
+            @thread = Thread.new { crawl_loop }
+          end
+        }
+      end
+
+      def stop
+        @lock.synchronize {
+          unless @thread.nil?
+            @thread.raise LoopAbortedException
+            @thread.join
+            @thread = nil
+          end
+        }
+      end
+
+      def restart
+        stop
+        start
       end
 
       def change_state(_name, _params={}, _wait=nil)
@@ -43,17 +62,6 @@ module Crabfarm
         }
       end
 
-      def cancel
-        @lock.synchronize {
-          if @working
-            @thread.terminate
-            @thread.join
-            @thread = Thread.new { crawl_loop }
-            @working = false
-          end
-        }
-      end
-
     private
 
       def matches_current_state?(_name, _params)
@@ -95,7 +103,7 @@ module Crabfarm
         context = Crabfarm::Context.new
 
         begin
-          while @running
+          loop do
             if @working
               @elapsed = Benchmark.measure do
                 begin
@@ -119,12 +127,14 @@ module Crabfarm
               }
             else sleep 0.2 end
           end
+        rescue LoopAbortedException
+          logger.info "StateLoop: stopping"
+
         rescue Exception => e
           logger.fatal "StateLoop: unhandled exception!"
           logger.fatal e
 
           @lock.synchronize {
-            @working = false
             @fatal = e
           }
         ensure

data/lib/crabfarm/forked_state.rb

@@ -2,7 +2,7 @@ module Crabfarm
   class ForkedState
     extend Forwardable
 
-    def_delegators :@state, :params, :get, :fetch
+    def_delegators :@state, :params, :get, :fetch, :event, :alert, :info
 
     def initialize(_state, _name, _mutex)
       @state = _state

data/lib/crabfarm/modes/server.rb

@@ -64,12 +64,13 @@ module Crabfarm
 
       def self.start(_options)
         @@evaluator = Engines::SafeStateLoop.new
+        @@evaluator.start
         begin
           Support::CustomPuma.run API, _options
         rescue SystemExit, Interrupt
           # just finish
         ensure
-          @@evaluator.release
+          @@evaluator.stop
         end
       end
 

data/lib/crabfarm/version.rb

@@ -1,3 +1,3 @@
 module Crabfarm
-  VERSION = "0.0.14"
+  VERSION = "0.0.15"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: crabfarm
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.15
 platform: ruby
 authors:
 - Ignacio Baixas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-04 00:00:00.000000000 Z
+date: 2015-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jbuilder