libis-workflow-mongoid 2.0.7 → 2.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 91c8528db9e9f763f02b9f246e7a49378889729a
-  data.tar.gz: b67569d5719ce03f0c27a944d59cd7999d0cc32c
+  metadata.gz: c58f0ada42f8b2fff98cdec7c60391e32f3b46cf
+  data.tar.gz: 995649c957d1b6763d99b92260d00a70aad91754
 SHA512:
-  metadata.gz: 8278935845d10521aa8ac5e169be733512f8614988e6e43849b7fa88975dc9c41fb3100a176558abf7b0c5d649e9cd49e942e2ea9c1dd271a60dd171b44752bd
-  data.tar.gz: 0fd3384e24e2c57f19a74f8b6934964a3397e3e149f90f12379b5cc2d8c04b3e66ecfede95a7f55a62f469e81312cdd4eafc41088c558f3a2dbaceb2eaf48973
+  metadata.gz: 0a39b24e484c371b36f67b60d3dd0e98ac30a2d5d23e8dbe69cb581df99bc71f0b9aee7752328ae50eec6a8e6d59298acd5c46c24d4dd3fc569a92e95de4e651
+  data.tar.gz: 166f3018b411aa524eaf02b653ebc68e17c08aaac8b4fb76ea0b325e31d5e410ca70b5ab0b6c1a6223a99178615e7c7c74c2fa73f80238d9b8844d1610abf653

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

@@ -22,7 +22,7 @@ module Libis
 
             field :_id, type: Integer, overwrite: true
             sequence :_id
-            index c_at: 1
+            index({c_at: 1}, {name: 'by_created'})
 
           end
         end

data/lib/libis/workflow/mongoid/dynamic.rb

@@ -28,7 +28,6 @@ module Libis
 
             field :_id, type: Integer, overwrite: true
             sequence :_id
-            index _id: 1
 
           end
         end

data/lib/libis/workflow/mongoid/job.rb

@@ -22,21 +22,22 @@ module Libis
         field :log_age, type: String, default: 'daily'
         field :log_keep, type: Integer, default: 5
 
-        index({name: 1}, {unique: 1})
+        index({name: 1}, {unique: 1, name: 'by_name'})
 
         has_many :runs, as: :job, dependent: :destroy, autosave: true, order: :c_at.asc
-
         belongs_to :workflow, polymorphic: true
 
+        index({workflow_id: 1, workflow_type: 1, name: 1}, {name: 'by_workflow'})
+
         def self.from_hash(hash)
           self.create_from_hash(hash, [:name]) do |item, cfg|
-            item.workflow = Libis::Workflow::Mongoid.from_hash(name: cfg.delete('workflow'))
+            item.workflow = Libis::Workflow::Mongoid::Workflow.from_hash(name: cfg.delete('workflow'))
           end
         end
 
         def logger
           return ::Libis::Workflow::Mongoid::Config.logger unless self.log_to_file
-          logger = ::Logging::Repository[self.name]
+          logger = ::Logging::Repository.instance[self.name]
           return logger if logger
           unless ::Logging::Appenders[self.name]
             ::Logging::Appenders::RollingFile.new(
@@ -59,7 +60,7 @@ module Libis
         def execute(opts = {})
           if self.log_each_run
             opts['run_config'] = {
-                'log_to_file=' => true,
+                'log_to_file' => true,
                 'log_level=' => self.log_level
             }
           end

data/lib/libis/workflow/mongoid/log_entry.rb

@@ -19,10 +19,10 @@ module Libis
         field :status, type: String
         field :run_id
 
-        index({logger_type: 1, logger_id: 1, c_at: 1}, {background: true, name: 'by_logger'})
-        index({logger_type: 1, logger_id: 1, c_at: 1, task: 1}, {background: true, name: 'by_logger_task'})
         index({logger_type: 1, logger_id: 1, c_at: 1, }, {background: true, name: 'by_logger'})
-        index({logger_type: 1, logger_id: 1, c_at: 1, status: 1}, {background: true, sparse: true, name: 'status_by_logger'})
+        index({logger_type: 1, logger_id: 1, c_at: 1, task: 1}, {background: true, name: 'by_task'})
+        index({logger_type: 1, logger_id: 1, c_at: 1, status: 1}, {background: true, sparse: true, name: 'by_status'})
+        index({logger_type: 1, logger_id: 1, c_at: 1, task:1, status: 1}, {background: true, sparse: true, name: 'by_task_status'})
 
         belongs_to :logger, polymorphic: true
 

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

@@ -15,6 +15,12 @@ module Libis
         field :log_level, type: String, default: 'DEBUG'
         field :log_filename, type: String
 
+        index({start_date: 1}, {sparse: 1, name: 'by_start'})
+
+        belongs_to :job, polymorphic: true
+
+        index({job_id: 1, job_type: 1, start_date: 1}, {sparse:1, name: 'by_job'})
+
         set_callback(:destroy, :before) do |document|
           wd = document.work_dir
           FileUtils.rmtree wd if wd && !wd.blank? && Dir.exist?(wd)
@@ -23,11 +29,6 @@ module Libis
           FileUtils.rm(log_file) if log_file && !log_file.blank? && File.exist?(log_file)
         end
 
-        index start_date: 1
-
-        belongs_to :job, polymorphic: true
-        embeds_one :log_config, as: :log_configurator
-
         def run(action = :run)
           self.tasks = []
           super action

data/lib/libis/workflow/mongoid/version.rb

@@ -1,7 +1,7 @@
 module Libis
   module Workflow
     module Mongoid
-      VERSION = '2.0.7' unless const_defined? :VERSION # the guard is against a redefinition warning that happens on Travis
+      VERSION = '2.0.8' unless const_defined? :VERSION # the guard is against a redefinition warning that happens on Travis
     end
   end
 end

data/lib/libis/workflow/mongoid/work_item.rb

@@ -15,14 +15,28 @@ module Libis
         field :properties, type: Hash, default: -> { Hash.new }
         field :summary, type: Hash, default: -> { Hash.new }
 
+        index({_id: 1, _type: 1}, {unique: true, name: 'by_id'})
+
         has_many :logs, as: :logger, class_name: Libis::Workflow::Mongoid::LogEntry.to_s,
-                 dependent: :destroy, autosave: true, order: :c_at.asc do
+                 dependent: :destroy, autosave: true do
           def log_history
-            where(:status.exists => false)
+            where(:status.exists => false).order(c_at: 1)
+          end
+
+          def status_log(task = nil)
+            if task
+              where(:status.exists => true, task: task)
+            else
+              where(:status.exists => true)
+            end.order(c_at: 1)
           end
 
-          def status_log
-            where(:status.exists => true)
+          def get_status(task = nil)
+            if task
+              where(:status.exists => true, task: task)
+            else
+              where(:status.exists => true)
+            end.order(c_at: -1).limit(1).first
           end
         end
 
@@ -31,6 +45,8 @@ module Libis
 
         belongs_to :parent, polymorphic: true
 
+        index({parent_id: 1, parent_type: 1, c_at: 1}, {name: 'by_parent'})
+
         set_callback(:destroy, :before) do |document|
           # noinspection RubyResolve
           document.logs.each { |log| log.destroy! }
@@ -59,6 +75,15 @@ module Libis
 
         protected
 
+        # Get last known status entry for a given task
+        #
+        # In the Mongid storage, we retrieve the status log in date descending order, so we retrieve the first item.
+        # @param [String] task task name to check item status for
+        # @return [Hash] the status entry
+        def status_entry(task = nil)
+          self.logs.get_status(task)
+        end
+
         def add_log_entry(msg)
           # noinspection RubyResolve
           self.logs.build(msg)

data/lib/libis/workflow/mongoid/workflow.rb

@@ -18,9 +18,9 @@ module Libis
         field :description, type: String
         field :config, type: Hash, default: -> { Hash.new }
 
-        index({name: 1}, {unique: 1})
+        index({name: 1}, {unique: 1, name: 'by_name'})
 
-        has_many :jobs, as: :workflow, dependent: :destroy, autosave: true, order: :c_at.asc
+        has_many :jobs, as: :workflow, dependent: :restrict, autosave: true, order: :name.asc
 
         def self.from_hash(hash)
           self.create_from_hash(hash, [:name]) do |item, cfg|

data/spec/workflow_spec.rb

@@ -60,15 +60,25 @@ describe 'TestWorkflow' do
     wf
   }
   let(:job) {
-    job = TestJob.find_or_initialize_by(name: 'TestJob')
-    job.configure(
+    job = TestJob.from_hash(
         'name' => 'TestJob',
         'description' => 'Job for testing',
         'workflow' => workflow,
         'run_object' => 'TestRun',
         'input' => {'dirname' => dirname, 'checksum_type' => 'SHA256'},
+        'log_to_file' => false
     )
 
+    # job = TestJob.find_or_initialize_by(name: 'TestJob')
+    # job.configure(
+    #     'name' => 'TestJob',
+    #     'description' => 'Job for testing',
+    #     'workflow' => workflow,
+    #     'run_object' => 'TestRun',
+    #     'input' => {'dirname' => dirname, 'checksum_type' => 'SHA256'},
+    #     'log_to_file' => false
+    # )
+
     # noinspection RubyResolve
     job.runs.each { |run| run.destroy! }
     job.save!
@@ -183,6 +193,7 @@ STR
     expect(my_job.runs.all.count).to eq 1
     my_run = my_job.runs.all.first
     expect(my_run).to eq run
+    expect(my_run.status).to eq :DONE
   end
 
   # noinspection RubyResolve

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: libis-workflow-mongoid
 version: !ruby/object:Gem::Version
-  version: 2.0.7
+  version: 2.0.8
 platform: ruby
 authors:
 - Kris Dekeyser