flor 0.10.0 → 0.11.0

data/lib/flor/unit/spooler.rb

@@ -0,0 +1,109 @@
+
+module Flor
+
+  class Spooler
+
+    # NB: logger configuration entries start with "spo_"
+
+    def initialize(unit)
+
+      @unit = unit
+
+      @dir = determine_spool_dir
+    end
+
+    def shutdown
+
+      @dir = nil
+    end
+
+    def spool
+
+      return -1 unless @dir
+
+      Dir[File.join(@dir, '*.json')]
+        .inject(0) do |count, path|
+
+          begin
+            File.open(path, 'rb') do |f|
+              lock(path, f) or next
+              accept(path, f) or next
+              unlock(path, f)
+            end
+            count += 1
+          rescue => err
+            reject(path, err)
+          end
+
+          count
+        end
+    end
+
+    protected
+
+    def determine_spool_dir
+
+      d = @unit.conf['spo_dir'] || 'var/spool'
+      d = File.join(@unit.conf['root'], d) if d
+      d = nil unless File.directory?(d)
+
+      d
+    end
+
+    def lock(path, file)
+
+      file.flock(File::LOCK_EX | File::LOCK_NB) == 0
+    end
+
+    def unlock(path, file)
+
+      # nothing more to do
+    end
+
+    def accept(path, file)
+
+      json = file.read
+
+      return false if json == ''
+
+      @unit.storage.put_message(JSON.parse(json))
+
+      con = File.join(@dir, 'consumed')
+
+      File.delete(path)
+
+      return true unless File.directory?(con)
+
+      fn = File.join(con, "#{File.basename(path, '.json')}.#{Flor.tamp}.json")
+
+      File.open(fn, 'wb') { |f| f.write(json) }
+
+      true
+    end
+
+    def reject(path, err)
+
+      rej = File.join(@dir, 'rejected')
+
+      FileUtils.mkdir_p(rej)
+
+      eh = err.hash.abs
+      ts = Flor.tamp
+
+      jfn = File.join(
+        rej, "#{File.basename(path, '.json')}__#{eh}_#{ts}.json")
+      tfn = File.join(
+        rej, "#{File.basename(path, '.json')}__#{eh}_#{ts}.txt")
+
+      FileUtils.mv(path, jfn)
+
+      File.open(tfn, 'wb') do |tf|
+        tf.puts(err.inspect)
+        tf.puts(err.class.to_s)
+        tf.puts(err.to_s)
+        tf.puts(err.backtrace)
+      end
+    end
+  end
+end
+

data/lib/flor/unit/storage.rb

@@ -254,7 +254,7 @@ module Flor
 
       synchronize do
 
-        @db[:flor_messages].count(status: 'created') > 0
+        @db[:flor_messages].where(status: 'created').count > 0
       end
 
     rescue => err

data/lib/flor/unit/waiter.rb

@@ -3,8 +3,6 @@ module Flor
 
   class Waiter
 
-    DEFAULT_TIMEOUT = 4 # seconds
-
     def initialize(exid, opts)
 
       serie, timeout, repeat = expand_args(opts)
@@ -12,7 +10,7 @@ module Flor
       @exid = exid
       @original_serie = repeat ? Flor.dup(serie) : nil
       @serie = serie
-      @timeout = timeout == true ? DEFAULT_TIMEOUT : timeout
+      @timeout = timeout
 
       @queue = []
       @mutex = Mutex.new
@@ -91,7 +89,7 @@ module Flor
 
       owait = opts[:wait]
       orepeat = opts[:repeat] || false
-      otimeout = opts[:timeout] || DEFAULT_TIMEOUT
+      otimeout = opts[:timeout]
 
       case owait
       when true

data/lib/flor/unit/wlist.rb

@@ -3,9 +3,17 @@ module Flor
 
   class WaitList
 
+    # NB: tasker configuration entries start with "wtl_"
+    #
+    # `wtl_default_timeout`:
+    #   when #launch ing or #wait ing, set the default timeout, in seconds
+
+    DEFAULT_TIMEOUT = Flor.env_i('FLOR_DEFAULT_TIMEOUT')
+
     def initialize(unit)
 
       @unit = unit
+      @unit.hooker.add('wlist', self)
 
       @mutex = Mutex.new
       @waiters = []
@@ -49,6 +57,11 @@ module Flor
           [ exid, opts ]
         end
 
+      opts[:timeout] =
+        nil if opts[:timeout] == true
+      opts[:timeout] ||=
+        (DEFAULT_TIMEOUT || @unit.conf['wtl_default_timeout'] || 5)
+
       @mutex.synchronize do
 
         (@waiters << Waiter.new(exid, opts)).last

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flor
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-02 00:00:00.000000000 Z
+date: 2017-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: munemo
@@ -162,6 +162,7 @@ files:
 - lib/flor/pcore/sequence.rb
 - lib/flor/pcore/set.rb
 - lib/flor/pcore/stall.rb
+- lib/flor/pcore/twig.rb
 - lib/flor/pcore/until.rb
 - lib/flor/pcore/val.rb
 - lib/flor/punit/cancel.rb
@@ -181,7 +182,9 @@ files:
 - lib/flor/tools/shell.rb
 - lib/flor/unit/executor.rb
 - lib/flor/unit/ganger.rb
+- lib/flor/unit/hook.rb
 - lib/flor/unit/hooker.rb
+- lib/flor/unit/hooks.rb
 - lib/flor/unit/journal.rb
 - lib/flor/unit/loader.rb
 - lib/flor/unit/logger.rb
@@ -191,7 +194,9 @@ files:
 - lib/flor/unit/models/trace.rb
 - lib/flor/unit/models/trap.rb
 - lib/flor/unit/models.rb
+- lib/flor/unit/runner.rb
 - lib/flor/unit/scheduler.rb
+- lib/flor/unit/spooler.rb
 - lib/flor/unit/storage.rb
 - lib/flor/unit/taskers.rb
 - lib/flor/unit/waiter.rb
@@ -199,6 +204,7 @@ files:
 - lib/flor/unit.rb
 - lib/flor.rb
 - flor.gemspec
+- fail.txt
 - LICENSE.txt
 - CHANGELOG.md
 - README.md