libis-workflow 2.0.beta.26 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f38564b780dda17bf3e9b9985ac768fe47d6eda5
-  data.tar.gz: 49d12b01cb4bf203e538ef1ce1eb656ab7267f4f
+  metadata.gz: 91b0c182d5d2f5214287dc2cd50eb0a7b9f4fbd3
+  data.tar.gz: 6c51f5afcd524d2314e05b5cf14f66aeb30e050b
 SHA512:
-  metadata.gz: 67a4e8d9bce4f62917acd19d97779c89dbfe499f43056667151d5fa890430bcf822ccabd55035dd1612eb59911610287cd2cb585d5bf0bf2fe237bc23147e0f1
-  data.tar.gz: 57ae40a1cd90165fc70d860c6279caeecfe5755997683103406666a43160cb5d19094c55428fd7f8da1b48b15c91ea2e45d0c7a948c5988ac9524ffa4ec5aed4
+  metadata.gz: c9c2b825f8ce8b5d6007975770e45694a8c6710ebc4a6f13cc37eb51810424c31867bfe8057195680893d68c8adf1e34a007c08257fbba198e5574423994a63f
+  data.tar.gz: 9f248db1a5e6ceb17560ed91534535783abf295e0b27130688721d7746496e91b0a77996bfcac3ec503495839f1f21a25e163d7ada667dfc5957b8e7510cf1df

data/lib/libis/workflow/base/logging.rb

@@ -3,7 +3,7 @@ module Libis
     module Base
       module Logging
 
-        # Helper function for the Tasks to add a log entry to the log_history.
+        # Helper function for the WorkItems to add a log entry to the log_history.
         #
         # The supplied message structure is expected to contain the following fields:
         # - :severity : ::Logger::Severity value
@@ -39,10 +39,14 @@ module Libis
                                      else
                                        [0, '']
                                      end
-          task = msg[:task] || '*UNKNOWN*'
+          task = msg[:task] || ''
           message_text = (message_text % args rescue "#{message_text} - #{args}")
 
-          self.add_log severity: severity, id: message_id.to_i, text: message_text, task: task
+          run_id = self.get_run.id rescue nil
+
+          self.add_log severity: severity, id: message_id.to_i, text: message_text, task: task, run_id: run_id
+
+          task = "[#{run_id}] #{task}" if run_id
           name = ''
           begin
             name = self.to_s
@@ -51,7 +55,9 @@ module Libis
           rescue
             # do nothing
           end
-          Config.logger.add(severity, message_text, ('%s - %s ' % [task, name]))
+
+          logger = self.get_run.logger rescue Config.logger
+          logger.add(severity, message_text, ('%s - %s ' % [task, name]))
         end
 
         protected

data/lib/libis/workflow/base/run.rb

@@ -15,6 +15,7 @@ module Libis
       #
       # - start_date: [Time] the timestamp of the execution of the run
       # - job: [Object] a reference to the Job this Run belongs to
+      # - id: [String] (Optional) a unique run number
       #
       # Note that ::Libis::Workflow::Base::WorkItem is a parent module and therefore requires implementation of the
       # attributes of that module too.

data/lib/libis/workflow/job.rb

@@ -20,6 +20,10 @@ module Libis
         @run_object = ::Libis::Workflow::Run.new
       end
 
+      def logger
+        Config.logger
+      end
+
     end
 
   end

data/lib/libis/workflow/run.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+require 'securerandom'
 
 require 'libis/workflow/config'
 require 'libis/workflow/workflow'
@@ -12,14 +12,23 @@ module Libis
     class Run < ::Libis::Workflow::WorkItem
       include ::Libis::Workflow::Base::Run
 
-      attr_accessor :start_date, :job
+      attr_accessor :start_date, :job, :id
 
       def initialize
         @start_date = Time.now
         @job = nil
+        @id = SecureRandom.hex(10)
         super
       end
 
+      def id
+        nil
+      end
+
+      def logger
+        self.properties['logger'] || (job.logger rescue nil)
+      end
+
     end
 
   end

data/lib/libis/workflow/task.rb

@@ -174,7 +174,7 @@ module Libis
 
       def substatus_check(status, item, task_or_item)
         if (failed = status[:FAILED]) > 0
-          warn "%d sub#{task_or_item}(s) failed", item, failed
+          error "%d sub#{task_or_item}(s) failed", item, failed
           update_status(item, :FAILED)
         end
 
@@ -184,7 +184,7 @@ module Libis
         end
 
         if (waiting = status[:ASYNC_WAIT]) > 0
-          warn "waiting for %d sub#{task_or_item}(s) in async process", item, waiting
+          info "waiting for %d sub#{task_or_item}(s) in async process", item, waiting
           update_status(item, :ASYNC_WAIT)
         end
 

data/lib/libis/workflow/version.rb

@@ -2,6 +2,6 @@
 
 module Libis
   module Workflow
-    VERSION = '2.0.beta.26' unless const_defined? :VERSION # the guard is against a redefinition warning that happens on Travis
+    VERSION = '2.0.0' unless const_defined? :VERSION # the guard is against a redefinition warning that happens on Travis
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: libis-workflow
 version: !ruby/object:Gem::Version
-  version: 2.0.beta.26
+  version: 2.0.0
 platform: ruby
 authors:
 - Kris Dekeyser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-26 00:00:00.000000000 Z
+date: 2016-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -174,9 +174,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.8