flor 1.1.1 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 553a980e772a1ce1d8990fc8d0744163b6615c5e9a4fe391d48ab73ac2219b2a
-  data.tar.gz: 7b922c56e568ac51cbb9cc3dbcb02c930984f94785ddd3b8ea76804ccff848de
+  metadata.gz: 4d69af5b3896b5a00daa44d3fc0c60e08d9ee893916e5aeff81869cc35b2967e
+  data.tar.gz: 6a780ea13692c00c23826462de49ad87f32e036103200d530fd247b4208fb682
 SHA512:
-  metadata.gz: fc920c9d3f305e3e31f174ebbb5d8e7f935742a9b5bcd5a75b80646d5803746315e91e4937156a01f3fcc512c477b8770e6a665a86bd61a81120f0e305027652
-  data.tar.gz: 4dd48c11b6f59d2efc4aec15060d0c7db07541b1af4037dc8402b6ef701f43b88928aaaf3306e6ae0e1237a79f5fb360c992cf58648e26edb398f7adf843970e
+  metadata.gz: a39bbe96e2d6f5d48502c3c364b3fab6411098ab569aa3fec5ec8a3ae47e0c15bec321c312b6b70c9ef9f2cf49e5feced6e672fa3dbb0edd5f2772fea7007138
+  data.tar.gz: c46e23499dffdf92acd34ac2961b91d3cbeeafdd98b40e30fdb0de8110293eecc8fc0fa1e5e0cb842a769f4e9b85ecebb032b6686b2e547d716aeca2b6862d37

data/CHANGELOG.md

@@ -2,6 +2,32 @@
 # CHANGELOG.md
 
 
+## flor 1.3.1  released 2021-04-19
+
+* Fix flor_pointers var deletion mechanism (type = ' var ')
+
+
+## flor 1.3.0  released 2021-04-13
+
+* Insert a row flor_pointers for 'failure'
+
+
+## flor 1.2.2  released 2021-03-29
+
+* Include data in flor_pointers
+* Ensure flor_pointers name is a string
+
+
+## flor 1.2.1  released 2021-03-22
+
+* If conf sto_db_logger is false, do not attach a logger to the db connection
+
+
+## flor 1.2.0  released 2021-03-15
+
+* Add #attd, #attl, #att_texts to Flor::Pointer
+
+
 ## flor 1.1.1  released 2021-03-03
 
 * Use YAML to have more compact msg_to_detail_s

data/lib/flor.rb

@@ -16,7 +16,7 @@ require 'dense'
 
 module Flor
 
-  VERSION = '1.1.1'
+  VERSION = '1.3.1'
 end
 
 require 'flor/colours'

data/lib/flor/core/procedure.rb

@@ -5,7 +5,7 @@ class Flor::Procedure < Flor::Node
   # "Returning vars" variables to pass back to pass upon reply.
   # In the 'receive' messages, it's a hash under the key 'rvars'.
   #
-  RVARS = %w[ idx ]
+  RVARS = %w[ idx ].freeze
 
   # Attributes that when given alone are turned to "true" attributes.
   #
@@ -13,7 +13,7 @@ class Flor::Procedure < Flor::Node
   #
   # The transformation occurs in Flor::Pro::Att ("_att").
   #
-  TRUE_ATTS = %w[ flank off disabled ]
+  TRUE_ATTS = %w[ flank off disabled ].freeze
 
   class << self
 
@@ -550,6 +550,8 @@ class Flor::Procedure < Flor::Node
     wrap_reply
   end
 
+  IF_UNLESS = %w[ _if _unless ].freeze
+
   # Grab on_error proc from incoming payload and stores it into parent node.
   #
   # Has no effect if there is no parent node.
@@ -562,7 +564,7 @@ class Flor::Procedure < Flor::Node
       @node; loop do
         pnode = parent_node(pnode)
         return unless pnode
-        break unless %w[ _if _unless ].include?(pnode['heap'])
+        break unless IF_UNLESS.include?(pnode['heap'])
       end
 
     flavour = "on_#{key}"
@@ -598,6 +600,8 @@ class Flor::Procedure < Flor::Node
     wrap('point' => 'entered', 'nid' => nid, 'tags' => ret)
   end
 
+  WRAP_KEYS = %w[ error cancel timeout ].freeze
+
   def wrap(h={})
 
     m = {}
@@ -642,7 +646,7 @@ class Flor::Procedure < Flor::Node
       # was considering passing the whole vars back (as 'varz'), but
       # it got in the way... and it might be heavy
 
-    %w[ error cancel timeout ]
+    WRAP_KEYS
       .each { |k|
         co = @node["child_on_#{k}"]
         next unless co

data/lib/flor/log.rb

@@ -343,7 +343,7 @@ module Flor
       o.puts(tree_to_s(node.lookup_tree(nid), nid, out: o)) if node
 
       o.puts "#{_c.dg}node:#{_c.yl}"
-      o.puts YAML.dump(n.merge('tree' => '(above)'))
+      o.puts n ? YAML.dump(n.merge('tree' => '(above)')) : 'nil'
 
       o.puts "#{_c.dg}nodes:#{_c.yl}"
       o.puts nods_to_s(executor, m, opts)

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

@@ -30,7 +30,7 @@ module Flor
     #end
 
     # If the pointer is a "var" pointer, returns the full value
-    # for the variable, as fund in the execution's node "0".
+    # for the variable, as found in the execution's node "0".
     #
     def full_value
 
@@ -38,6 +38,25 @@ module Flor
 
       node['vars'][name]
     end
+
+    def attd
+
+      data['atts'].inject({}) { |h, (k, v)| h[k] = v if k; h }
+
+    rescue; []
+    end
+
+    def attl
+
+      data['atts'].inject([]) { |a, (k, v)| a << v if k == nil; a }
+
+    rescue; []
+    end
+
+    def att_texts
+
+      attl.select { |e| e.is_a?(String) }
+    end
   end
 end
 

data/lib/flor/unit/scheduler.rb

@@ -242,18 +242,18 @@ module Flor
       end
     end
 
+    RETURN_KEYS = %w[ exid nid payload tasker cause ].freeze
+
     def return(message)
 
-      m =
+      queue(
         if message['point'] == 'failed'
           message
         else
           message
-            .select { |k, _| %w[ exid nid payload tasker cause ].include?(k) }
+            .select { |k, _| RETURN_KEYS.include?(k) }
             .merge!('point' => 'return')
-        end
-
-      queue(m)
+        end)
 
       nil
     end
@@ -432,7 +432,7 @@ module Flor
       ex ? ex.execution : nil
     end
 
-    DUMP_KEYS = %w[ timestamp executions timers traps pointers ]
+    DUMP_KEYS = %w[ timestamp executions timers traps pointers ].freeze
 
     # Dumps all or some of the executions to a JSON string.
     # See Scheduler#load for importing.
@@ -598,6 +598,8 @@ module Flor
       puts(on_start_exc(ex))
     end
 
+    PREP_KEYS = %w[ exid name nid payload on_receive_last ].freeze
+
     def prepare_message(point, args)
 
       h = args
@@ -612,7 +614,7 @@ module Flor
       opts = {}
 
       h.each do |k, v|
-        if %w[ exid name nid payload on_receive_last ].include?(k)
+        if PREP_KEYS.include?(k)
           msg[k] = v
         else
           opts[k.to_sym] = v

data/lib/flor/unit/storage.rb

@@ -12,8 +12,9 @@ module Flor
       :status, :ctime, :mtime, :cunit, :munit
         ].freeze
     POINTER_COLUMNS = [
-      :domain, :exid, :nid, :type, :name, :value, :ctime, :cunit
-        ].freeze
+      :domain, :exid, :nid, :type, :name, :value, :ctime, :cunit,
+        :content
+          ].freeze
 
     attr_reader :unit, :db, :models
 
@@ -219,6 +220,9 @@ module Flor
       raise err
     end
 
+    CRECON_STATUSES = %w[ created consumed ].freeze
+    RESCON_STATUSES = %w[ reserved consumed ].freeze
+
     def load_messages(exe_count)
 
       exe_count += 2
@@ -229,12 +233,12 @@ module Flor
         _exids_being_processed =
           @db[:flor_messages]
             .select(:exid)
-            .exclude(status: %w[ created consumed ])
+            .exclude(status: CRECON_STATUSES)
         _exids =
           @db[:flor_messages]
             .select(:exid)
             .exclude(exid: _exids_being_processed)
-            .exclude(status: %w[ reserved consumed ])
+            .exclude(status: RESCON_STATUSES)
             .limit(exe_count)
         @db[:flor_messages]
           .where(exid: _exids, status: 'created')
@@ -317,7 +321,7 @@ module Flor
       []
     end
 
-    POINTS_TO_ARCHIVE = %w[ terminated failed ceased ]
+    POINTS_TO_ARCHIVE = %w[ terminated failed ceased ].freeze
 
     def consume(messages)
 
@@ -685,6 +689,8 @@ module Flor
         # done in update_pointers
     end
 
+    FP_TYPES = %w[ var ].freeze
+
     def update_pointers(exe, status, now)
 
 # Q  Should we archive old pointers?
@@ -700,7 +706,7 @@ module Flor
 
       @db[:flor_pointers]
         .where(exid: exid)
-        .where(Sequel.|({ type: %w[ var ] }, Sequel.~(nid: exe['nodes'].keys)))
+        .where(Sequel.|({ type: FP_TYPES }, Sequel.~(nid: exe['nodes'].keys)))
         .delete
           #
           # Delete all pointer to vars, their value might have changed,
@@ -713,28 +719,57 @@ module Flor
       pointers = exe['nodes']
         .inject([]) { |a, (nid, node)|
 
+          # add a pointer for each tag
+
           ts = node['tags']
           ts.each { |t|
             a << [ dom, exid, nid, 'tag', t, nil, now, u, nil ] } if ts
 
+          # add a pointer for each var (if nid == '0')
+
           vs = nid == '0' ? node['vars'] : nil
           vs.each { |k, v|
             case v; when Numeric, String, TrueClass, FalseClass, NilClass
-              a << [ dom, exid, '0', 'var', k, v.to_s, now, u, nil ]
+              a << [ dom, exid, '0', 'var', k, v.to_s, now, u, v ]
             when Array, Hash
               s = '(array)'; s = '(object)' if v.is_a?(Hash)
-              a << [ dom, exid, '0', 'var', k, s, now, u, nil ]
+              a << [ dom, exid, '0', 'var', k, s, now, u, v ]
             else
-              a << [ dom, exid, '0', 'var', k, nil, now, u, nil ]
+              a << [ dom, exid, '0', 'var', k, nil, now, u, v ]
             end } if vs
 
+          # add a pointer for the task if any
+
           if ta = node['task']
             tasker = ta['tasker']
-            name = ta['name']
+            n = ta['name']; name = n.is_a?(String) ? n : JSON.dump(n)
             content = { message: node['message'], atts: node['atts'] }
             a << [ dom, exid, nid, 'tasker', tasker, name, now, u, content ]
           end
 
+          # add a pointer for the error if any
+
+          if fa = node['failure']
+
+#puts "-" * 80; pp node; puts "-" * 80
+            a <<
+              if er = fa['error']
+                ni = fa['from'] || nid # not nid /!\
+                nam = "#{er['kla']} l#{er['lin']}"
+                val = er['msg']
+                con = { error: fa, nid: ni }
+                [ dom, exid, ni, 'failure', nam, val, now, u, con ]
+              else
+                nam = fa['tasker'] || 'failure'
+                val = [ fa['attl'] || [], fa['attd'] || {} ]
+                  .collect(&:inspect).join(' ')
+                con = { error: fa, nid: nid }
+                [ dom, exid, nid, 'failure', nam, val, now, u, con ]
+              end
+          end
+
+          # done
+
           a }
 
       cps = @db[:flor_pointers] # current pointers
@@ -746,29 +781,22 @@ module Flor
           #
           # don't insert when already inserted
 
-      if pointer_columns.include?(:content)
-        pointers.each { |ptr|
-          c = ptr[8]; ptr[8] = to_blob(c) if c }
-      else
-        pointers.each { |ptr|
-          ptr.pop }
-      end
+      pointers.each { |ptr| c = ptr[8]; ptr[8] = to_blob(c) if c }
 
       @db[:flor_pointers]
         .import(
-          pointer_columns,
+          POINTER_COLUMNS,
           pointers)
     end
 
-    def pointer_columns
-
-      @pointer_columns ||=
-        if @db[:flor_pointers].columns.include?(:content)
-          POINTER_COLUMNS + [ :content ]
-        else
-          POINTER_COLUMNS
-        end
-    end
+    #def pointer_columns
+    #  @pointer_columns ||=
+    #    if @db[:flor_pointers].columns.include?(:content)
+    #      POINTER_COLUMNS + [ :content ]
+    #    else
+    #      POINTER_COLUMNS
+    #    end
+    #end
 
     def determine_type_and_schedule(message)
 
@@ -849,8 +877,11 @@ module Flor
           # NB: -1 means "check at every use"
       end
 
-      @db_logger = DbLogger.new(@unit)
-      @db.loggers << @db_logger
+      if @unit.conf['sto_db_logger'] != false
+
+        @db_logger = DbLogger.new(@unit)
+        @db.loggers << @db_logger
+      end
     end
 
     class << self

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flor
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.3.1
 platform: ruby
 authors:
 - John Mettraux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-03 00:00:00.000000000 Z
+date: 2021-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: munemo