flor 0.10.0 → 0.11.0

data/lib/flor/unit/hooker.rb

@@ -53,7 +53,9 @@ module Flor
 
     def notify(executor, message)
 
-      (@hooks + executor.traps.collect(&:to_hook))
+      (
+        @hooks + executor.traps_and_hooks
+      )
         .inject([]) do |a, (_, opts, hook, block)|
           # name of hook is piped into "_" oblivion
 
@@ -64,17 +66,8 @@ module Flor
               executor.trigger_trap(hook, message)
             elsif hook
               executor.trigger_hook(hook, message)
-            else # if block
-              r =
-                if block.arity == 1
-                  block.call(message)
-                elsif block.arity == 2
-                  block.call(message, opts)
-                else
-                  block.call(executor, message, opts)
-                end
-              r.is_a?(Array) && r.all? { |e| e.is_a?(Hash) } ? r : []
-                # be lenient with block hooks, help them return an array
+            else
+              executor.trigger_block(block, opts, message)
             end)
         end
     end

data/lib/flor/unit/hooks.rb

@@ -0,0 +1,37 @@
+
+module Flor
+
+  class BasicHook
+
+    def initialize(executor, opts, message)
+
+      @executor = executor
+      @opts = opts
+      @message = message
+    end
+
+    protected
+
+    def point
+
+      @message['point']
+    end
+  end
+
+  class PointHook < BasicHook
+
+    def on
+
+      m = "on_#{point}"
+
+      respond_to?(m) ? send(m) : on_default
+    end
+
+    protected
+
+    def on_default
+
+      []
+    end
+  end
+end

data/lib/flor/unit/loader.rb

@@ -11,6 +11,8 @@ module Flor
 
       @cache = {}
       @mutex = Mutex.new
+
+      @root = File.absolute_path(@unit.conf['lod_path'] || @unit.conf['root'])
     end
 
     def shutdown
@@ -18,7 +20,7 @@ module Flor
 
     def variables(domain)
 
-      Dir[File.join(root, '**/*.json')]
+      Dir[File.join(@root, '**/*.json')]
         .select { |f| f.index('/etc/variables/') }
         .collect { |pa| [ pa, expose_d(pa, {}) ] }
         .select { |pa, d| is_subdomain?(domain, d) }
@@ -39,7 +41,11 @@ module Flor
       domain, name, opts = [ domain, nil, name ] if name.is_a?(Hash)
       domain, name = split_dn(domain, name)
 
-      path, d, n = (Dir[File.join(root, '**/*.{flo,flor}')])
+      if m = name.match(/(\.flor?)\z/)
+        name = name[0..m[1].length - 1]
+      end
+
+      path, d, n = (Dir[File.join(@root, '**/*.{flo,flor}')])
         .select { |f| f.index('/lib/') }
         .collect { |pa| [ pa, *expose_dn(pa, opts) ] }
         .select { |pa, d, n| n == name && is_subdomain?(domain, d) }
@@ -51,9 +57,12 @@ module Flor
 
     def tasker(domain, name=nil)
 
+      # NB: do not relativize path, because Ruby load path != cwd,
+      # stay absolute for `require` and `load`
+
       domain, name = split_dn(domain, name)
 
-      path, d, n = Dir[File.join(root, '**/*.json')]
+      path, d, n = Dir[File.join(@root, '**/*.json')]
         .select { |pa| pa.index('/lib/taskers/') }
         .collect { |pa| [ pa, *expose_dn(pa, {}) ] }
         .select { |pa, d, n|
@@ -72,7 +81,34 @@ module Flor
 
       return nil unless con
 
-      con.merge!('_path' => conf['_path'])
+      pa = conf['_path']
+
+      if con.is_a?(Array)
+        con.each { |c| c['_path'] = pa }
+      else
+        con['_path'] = pa
+      end
+
+      con
+    end
+
+    def hooks(domain, name=nil)
+
+      Dir[File.join(@root, '**/*.json')]
+        .select { |f| f.index('/lib/hooks/') }
+        .collect { |pa| [ pa, expose_d(pa, {}) ] }
+        .select { |pa, d| is_subdomain?(domain, d) }
+        .sort_by { |pa, d| d.count('.') }
+        .collect { |pa, d|
+          interpret(pa).each_with_index { |h, i|
+            h['_path'] = Flor.relativize_path(pa) + ":#{i}" } }
+        .flatten(1)
+    end
+
+    def load_hooks(exid)
+
+      hooks(Flor.domain(exid))
+        .collect { |h| Flor::Hook.new(@unit, exid, h) }
     end
 
     protected
@@ -98,19 +134,19 @@ module Flor
 
     def expose_d(path, opts)
 
-      pa = path[root.length..-1]
+      pa = path[@root.length..-1]
       pa = pa[5..-1] if pa[0, 5] == '/usr/'
 
       libregex =
         opts[:subflows] ?
-        /\/lib\/(subflows|flows|taskers)\// :
-        /\/lib\/(flows|taskers)\//
+        /\/lib\/(subflows|flows|hooks|taskers)\// :
+        /\/lib\/(flows|hooks|taskers)\//
 
       pa
         .sub(/\/etc\/variables\//, '/')
         .sub(libregex, '/')
         .sub(/\/\z/, '')
-        .sub(/\/(flo|flor|dot)\.json\z/, '')
+        .sub(/\/(flo|flor|dot|hooks)\.json\z/, '')
         .sub(/\.(flo|flor|json)\z/, '')
         .sub(/\A\//, '')
         .gsub(/\//, '.')
@@ -127,15 +163,6 @@ module Flor
       end
     end
 
-    def root
-
-      if lp = @unit.conf['lod_path']
-        File.absolute_path(lp)
-      else
-        File.dirname(File.absolute_path(@unit.conf['_path'] + '/..'))
-      end
-    end
-
     def interpret(path)
 
       @mutex.synchronize do

data/lib/flor/unit/logger.rb

@@ -14,6 +14,7 @@ module Flor
     def initialize(unit)
 
       @unit = unit
+      @unit.hooker.add('logger', self)
 
       @out = prepare_out
 

data/lib/flor/unit/models/trap.rb

@@ -5,33 +5,29 @@ module Flor
 
     def to_hook
 
-      @hook ||=
-        begin
-
-          opts = {}
-
-          opts[:consumed] = tconsumed
-
-          opts[:point] = tpoints.split(',') if tpoints
-          opts[:heap] = theaps.split(',') if theaps
-          opts[:heat] = theats.split(',') if theats
-
-          opts[:name] = data['names']
-
-          case trange
-            when 'execution'
-              opts[:exid] = exid
-            when 'subdomain'
-              opts[:subdomain] = Flor.domain(exid)
-            when 'domain'
-              opts[:domain] = Flor.domain(exid)
-            else #'subnid' # default
-              opts[:exid] = exid
-              opts[:subnid] = true
-          end
+      opts = {}
+
+      opts[:consumed] = tconsumed
+
+      opts[:point] = tpoints.split(',') if tpoints
+      opts[:heap] = theaps.split(',') if theaps
+      opts[:heat] = theats.split(',') if theats
+
+      opts[:name] = data['names']
+
+      case trange
+        when 'execution'
+          opts[:exid] = exid
+        when 'subdomain'
+          opts[:subdomain] = Flor.domain(exid)
+        when 'domain'
+          opts[:domain] = Flor.domain(exid)
+        else #'subnid' # default
+          opts[:exid] = exid
+          opts[:subnid] = true
+      end
 
-          [ "trap#{id}", opts, self, nil ]
-        end
+      [ "trap#{id}", opts, self, nil ]
     end
 
     def trigger(executor, message)

data/lib/flor/unit/runner.rb

@@ -0,0 +1,84 @@
+
+module Flor
+
+  class Runner
+
+    # NB: tasker configuration entries start with "rnr_"
+
+    def initialize(unit)
+
+      @unit = unit
+    end
+
+    def shutdown
+    end
+
+    def run(service, conf, message)
+
+      return ruby_run(service, conf, message) if conf['class'] || conf['module']
+      return cmd_run(service, conf, message) if conf['cmd']
+
+      fail ArgumentError.new("don't know how to run item at #{conf['_path']}")
+    end
+
+    protected
+
+    def fjoin(root, path)
+
+      root == '.' ? path : File.join(root, path)
+    end
+
+    def ruby_run(service, conf, message)
+
+      root = File.dirname(conf['_path'])
+
+      Flor.h_fetch_a(conf, 'require').each { |pa|
+        fail ArgumentError.new('".." not allowed in paths') if pa =~ /\.\./
+        require(fjoin(root, pa)) }
+      Flor.h_fetch_a(conf, 'load').each { |pa|
+        fail ArgumentError.new('".." not allowed in paths') if pa =~ /\.\./
+        load(fjoin(root, pa)) }
+
+      k = Flor.const_lookup(conf['class'] || conf['module'])
+
+      o =
+        if k.class == Module
+          k
+        else
+          case k.instance_method(:initialize).arity
+          when 1 then k.new(service)
+          when 2 then k.new(service, conf)
+          when 3 then k.new(service, conf, message)
+          when -1 then k.new({
+            service: service, configuration: conf, message: message })
+          else k.new
+          end
+        end
+
+      p = message['point']
+      m = :on
+      m = "on_#{p}" if ! o.respond_to?(m)
+      m = p if ! o.respond_to?(m)
+      m = :cancel if m == 'detask' && ! o.respond_to?(m)
+
+      fail(
+        "#{k.class.to_s.downcase} #{k} doesn't respond to on, on_#{p} or #{p}"
+      ) if ! o.respond_to?(m)
+
+      case o.method(m).arity
+      when 1 then o.send(m, message)
+      when 2 then o.send(m, conf, message)
+      when 3 then o.send(m, executor, conf, message)
+      when -1 then o.send(m, {
+        service: service, configuration: conf, message: message })
+      else o.send(m)
+      end
+    end
+
+    def cmd_run(service, conf, message)
+
+fail NotImplementedError
+    end
+  end
+end
+

data/lib/flor/unit/scheduler.rb

@@ -5,7 +5,7 @@ module Flor
 
     attr_reader :conf, :env
 
-    attr_reader :hooker, :storage, :loader, :ganger
+    attr_reader :hooker, :storage, :loader, :ganger, :runner
     attr_reader :logger
 
     attr_reader :thread_status
@@ -27,20 +27,24 @@ module Flor
       @env = (Kernel.const_get(@env) rescue @env) if @env.match(/\A[A-Z]+\z/)
         # when env is "RAILS_ENV" for example...
 
+      @loader =
+        (Flor::Conf.get_class(@conf, 'loader') || Flor::Loader).new(self)
+      @runner =
+        (Flor::Conf.get_class(@conf, 'runner') || Flor::Runner).new(self)
       @hooker =
         (Flor::Conf.get_class(@conf, 'hooker') || Flor::Hooker).new(self)
       @storage =
         (Flor::Conf.get_class(@conf, 'storage') || Flor::Storage).new(self)
-      @loader =
-        (Flor::Conf.get_class(@conf, 'loader') || Flor::Loader).new(self)
       @ganger =
         (Flor::Conf.get_class(@conf, 'ganger') || Flor::Ganger).new(self)
 
       @logger =
         (Flor::Conf.get_class(@conf, 'logger') || Flor::Logger).new(self)
+      @wlist =
+        (Flor::Conf.get_class(@conf, 'wlist') || Flor::WaitList).new(self)
 
-      @hooker.add('logger', @logger)
-      @hooker.add('wlist', Flor::WaitList)
+      @spooler =
+        (Flor::Conf.get_class(@conf, 'spooler') || Flor::Spooler).new(self)
 
       @heart_rate = @conf[:sch_heart_rate] || 0.3
       @reload_after = @conf[:sch_reload_after] || 60
@@ -82,7 +86,7 @@ module Flor
             Socket.ip_address_list.find { |a| a.ipv4_private? } ||
             Socket.ip_address_list.find { |a| a.ip_address != '::1' }
           ip =
-            ai ? ai.ip_address : '::1'
+            (ai ? ai.ip_address : '::1').split('%').first
           [
             'sch', self.name,
             'i' + ip,
@@ -149,46 +153,13 @@ module Flor
 
       @thread =
         if @thread
-
           @thread.run
-
         else
-
           Thread.new do
-
             loop do
-
-              begin
-
-                Thread.stop if @thread_status == :stop
-                break if @thread_status == :shutdown
-
-                t0 = Time.now
-
-                if should_wake_up?
-
-                  unreserve_messages
-
-                  trigger_timers
-                  trigger_executions
-
-                  reload_next_time
-                  reload_wake_up
-                  @reloaded_at = Time.now
-
-                elsif @executors.empty?
-
-                  @idle_count += 1
-                  notify(nil, make_idle_message)
-                end
-
-                sleep [ @heart_rate - (Time.now - t0), 0 ].max #\
-                  #unless should_wake_up?
-
-              rescue Exception => ex
-
-                puts on_start_exc(ex)
-              end
+              Thread.stop if @thread_status == :stop
+              break if @thread_status == :shutdown
+              tick
             end
           end
         end
@@ -360,6 +331,37 @@ module Flor
 
     protected
 
+    def tick
+
+      t0 = Time.now
+
+      spool
+
+      if should_wake_up?
+
+        unreserve_messages
+
+        trigger_timers
+        trigger_executions
+
+        reload_next_time
+        reload_wake_up
+        @reloaded_at = Time.now
+
+      elsif @executors.empty?
+
+        @idle_count += 1
+        notify(nil, make_idle_message)
+      end
+
+      sleep [ @heart_rate - (Time.now - t0), 0 ].max #\
+        #unless should_wake_up?
+
+    rescue Exception => ex
+
+      puts on_start_exc(ex)
+    end
+
     def prepare_on_receive_last(h)
 
       ei = h[:exid] || h['exid']
@@ -409,14 +411,17 @@ module Flor
       m
     end
 
-    def should_wake_up?
+    def reload_after
+
+      @idle_count < 5 ? 1 : @reload_after
+    end
 
-      return true if Time.now - @reloaded_at >= @reload_after
+    def should_wake_up?
 
       return true if @wake_up
-      return false unless @next_time
+      return true if Time.now - @reloaded_at >= reload_after
 
-      @next_time <= Flor.tstamp.split('.').first
+      @next_time && @next_time <= Flor.tstamp.split('.').first
     end
 
     def unreserve_messages
@@ -428,6 +433,12 @@ module Flor
       ) if c > 0
     end
 
+    def spool
+
+      count = @spooler.spool
+      @wake_up = true if count > 0
+    end
+
     def trigger_timers
 
       @storage.trigger_timers