flor 0.9.4 → 0.9.5

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 # flor CHANGELOG.md
 
 
+## flor 0.9.5  released 2017-02-10
+
+- Don't load exids for which there are "loaded" messages
+- Use Flor.tstamp for flor_messages :mtime
+
+
 ## flor 0.9.4  released 2017-02-09
 
 - Allow setting of flor_debug in ENV (FLOR_DEBUG) and in conf

data/README.md

@@ -6,6 +6,9 @@
 
 Flor is a "Ruby workflow engine", if that makes any sense.
 
+* [![Join the chat at https://gitter.im/floraison/flor](https://badges.gitter.im/floraison/flor.svg)](https://gitter.im/floraison/flor?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+* [floraison mailing list](https://groups.google.com/forum/#!forum/floraison)
+
 ## Design
 
 * Strives to propose a scheming interpreter for long running executions
@@ -20,7 +23,7 @@ Flor is a "Ruby workflow engine", if that makes any sense.
 
 ## Documentation
 
-see [doc/](tree/master/doc).
+see [doc/](doc/).
 
 ## Running the specs
 

data/lib/flor.rb

@@ -34,7 +34,7 @@ require 'raabro'
 
 module Flor
 
-  VERSION = '0.9.4'
+  VERSION = '0.9.5'
 end
 
 require 'flor/colours'

data/lib/flor/core/executor.rb

@@ -360,7 +360,7 @@ module Flor
       @execution['tasks'][message['nid']] =
         { 'tasker' => message['tasker'], 'name' => message['taskname'] }
 
-      @unit.ganger.task(message)
+      @unit.ganger.task(self, message)
     end
     alias detask task
 

data/lib/flor/unit/ganger.rb

@@ -45,7 +45,7 @@ module Flor
       !! @unit.loader.tasker(domain, name)
     end
 
-    def task(message)
+    def task(executor, message)
 
       domain = message['exid'].split('-', 2).first
       tname = message['tasker']
@@ -63,7 +63,7 @@ module Flor
       message['tconf'] = tconf \
         unless tconf['on_task']['include_tconf'] == false
 
-      message['vars'] = gather_vars(tconf, message)
+      message['vars'] = gather_vars(executor, tconf, message)
 
       cot = tconf['on_task']
 
@@ -178,18 +178,25 @@ module Flor
       }.compact
     end
 
-    def gather_vars(tconf, message)
+    def gather_vars(executor, tconf, message)
 
-      iv = expand_filter(tconf['on_task']['include_vars'])
-      ev = expand_filter(tconf['on_task']['exclude_vars'])
+      ot = tconf['on_task']
 
-      return nil unless iv || ev
+      # try to return before calling executor.vars(nid) which my be costly...
 
-      vars = @unit.executor(message['exid']).vars(message['nid'])
+      return nil if (ot.keys & %w[ include_vars exclude_vars ]).empty?
+        # default behaviour, don't pass variables to taskers
 
-      return vars if iv == true
+      iv = expand_filter(ot['include_vars'])
+      return nil if iv == false
+
+      ev = expand_filter(ot['exclude_vars'])
       return {} if ev == true
 
+      vars = executor.vars(message['nid'])
+
+      return vars if iv == true
+
       vars = vars.select { |k, v| var_match(k, iv) } if iv
       vars = vars.reject { |k, v| var_match(k, ev) } if ev
 

data/lib/flor/unit/storage.rb

@@ -121,15 +121,21 @@ module Flor
 
     def load_exids
 
-# TODO eventually, exclude exids for which there are "loaded" messages
-
       synchronize do
 
+        # only take messages that are 'created' and for whose exid
+        # there are no loaded messages
+
+        # TODO update status to 'created' for messages that have been
+        #      'loaded' for too long
+
         @db[:flor_messages]
           .select(:exid)
-          .group(:exid)
-          .where(status: 'created')
-          .order { min(:ctime) }
+          .where(exid:
+            @db[:flor_messages].select(:exid).where(status: 'created'))
+          .exclude(exid:
+            @db[:flor_messages].select(:exid).where(status: 'loaded'))
+          .order(:mtime)
           .collect { |r| r[:exid] }
       end
 
@@ -230,6 +236,8 @@ module Flor
 
       transync do
 
+        # TODO weave in [some] optimistic locking here
+
         mids = []
 
         ms = @db[:flor_messages]
@@ -243,7 +251,7 @@ module Flor
 
         @db[:flor_messages]
           .where(id: mids)
-          .update(status: 'loaded', mtime: Time.now)
+          .update(status: 'loaded', mtime: Flor.tstamp)
              #
              # flag them as "loaded" so that other scheduler don't pick them
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flor
 version: !ruby/object:Gem::Version
-  version: 0.9.4
+  version: 0.9.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-08 00:00:00.000000000 Z
+date: 2017-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: munemo