flor 0.9.3 → 0.9.4

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 # flor CHANGELOG.md
 
 
+## flor 0.9.4  released 2017-02-09
+
+- Allow setting of flor_debug in ENV (FLOR_DEBUG) and in conf
+- Revise Storage#load_exids (distinct/order by problem on MS-SQL)
+
+
 ## flor 0.9.3  released 2017-02-07
 
 - Rename the head 'tasker' as 'ganger'

data/lib/flor.rb

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

data/lib/flor/conf.rb

@@ -51,18 +51,15 @@ module Flor
     #   (before quitting and passing the hand)
     #
 
-    def self.read(s)
-
-      Flor::ConfExecutor.interpret(s)
-    end
-
     LOG_DBG_KEYS = %w[ dbg msg err src tree tree_rw run ]
     LOG_ALL_KEYS = %w[ all log sto ] + LOG_DBG_KEYS
 
-    def self.read_env
+    def self.interpret_flor_debug(v)
+
+      a = v || ''
+      a = a.split(',') if a.is_a?(String)
+      a = a.collect(&:strip)
 
-      a =
-        (ENV['FLOR_DEBUG'] || '').split(',')
       h =
         a.inject({}) { |h, kv|
           k, v = kv.split(':')
@@ -87,6 +84,18 @@ module Flor
       h
     end
 
+    def self.read(s)
+
+      h = Flor::ConfExecutor.interpret(s)
+
+      h.merge!(interpret_flor_debug(h['flor_debug']))
+    end
+
+    def self.read_env
+
+      interpret_flor_debug(ENV['FLOR_DEBUG'])
+    end
+
     def self.get_class(conf, key)
 
       if v = conf[key]

data/lib/flor/unit/logger.rb

@@ -24,6 +24,12 @@
 
 module Flor
 
+  # TODO I need levels, ::Logger has them
+  # TODO I need log rotation, ::Logger has then
+  # TODO I need line heads, ::Logger has them (and @progname)
+  # TODO ::Logger has a formatting callback
+  # TODO I need simply @out.puts...
+
   class Logger
 
     # NB: logger configuration entries start with "log_"
@@ -63,7 +69,6 @@ module Flor
 
       if err
         sts = ' ' * stp.length
-        lvs = ' ' * (@uni.length + 1 + lvl.length)
         dig = lvl[0, 1] + Digest::MD5.hexdigest(line)[0, 4]
         @out.puts("#{stp} #{@uni} #{lvl} #{dig} #{txt}")
         err.backtrace.each { |lin| @out.puts("  #{dig} #{@uni} #{lin}") }
@@ -74,7 +79,6 @@ module Flor
 
     def notify(executor, msg)
 
-# TODO log to outfile
       if msg['rewritten'] && @unit.conf['log_tree_rw']
 
         Flor.print_compact_tree(

data/lib/flor/unit/storage.rb

@@ -121,14 +121,15 @@ module Flor
 
     def load_exids
 
+# TODO eventually, exclude exids for which there are "loaded" messages
+
       synchronize do
 
         @db[:flor_messages]
           .select(:exid)
+          .group(:exid)
           .where(status: 'created')
-          .order_by(:ctime)
-          .distinct
-          .all
+          .order { min(:ctime) }
           .collect { |r| r[:exid] }
       end
 
@@ -229,15 +230,20 @@ module Flor
 
       transync do
 
+        mids = []
+
         ms = @db[:flor_messages]
           .select(:id, :content)
           .where(status: 'created', exid: exid)
-          .order_by(:id)
-          .map { |m| r = from_blob(m[:content]) || {}; r['mid'] = m[:id]; r }
+          .order(:id)
+          .collect { |m|
+            r = from_blob(m[:content]) || {}
+            mid = m[:id]; r['mid'] = mid; mids << mid;
+            r }
 
         @db[:flor_messages]
-          .where(id: ms.collect { |m| m['mid'] })
-          .update(status: 'loaded')
+          .where(id: mids)
+          .update(status: 'loaded', mtime: Time.now)
              #
              # flag them as "loaded" so that other scheduler don't pick them
 
@@ -296,7 +302,7 @@ module Flor
         timers
           .select(:id, :content)
           .where(status: 'active')
-          .order_by(:id)
+          .order(:id)
           .all
       end
 

metadata

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