libis-workflow-mongoid 2.0.16 → 2.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fc886c4a1a8abb4255e9b9028be2e1095e93c36a
-  data.tar.gz: ba0d915839897f34e79ae25568046a37d9544be8
+  metadata.gz: 36e37f56b5fe461493670fed2f6f1fe9824cb789
+  data.tar.gz: f4a05cf3858093988bc123dbd60ee43793af53d9
 SHA512:
-  metadata.gz: f3bf1c91c046cac7dd6bb1682cdcc4fdf5bbe7246a3189d4bf5a392cfe6fa9277d460a52efaa48ee38c0ed9eac864a6b98962a2ad6da79d8d0ee99b866404621
-  data.tar.gz: f8fdb0b0592b8541f5bd562a6881eb800301202cfb89f54257663c2f8d57ea4e07d645eb8ef8acbaa4ac290100c782b815c8d4d5007f17b5fa75c7c9413e26f6
+  metadata.gz: c05c2a5633b832ff85164da27122a06b9e3cec6805873ba3e597207fa0e7b312b86139f96cdba89031c34cb8752c2513ecdf5804e83a490c76fa37411fec0767
+  data.tar.gz: 4e8abf24693b4623f0a459925fe8491cc2681b338e69a857e369e5921a5a85cb21064b9b1c0365b24ad7a3b63052fde9e277ea1393914d9c15ba5e8cc122d675

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

@@ -22,13 +22,27 @@ module Libis
         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)
-          # noinspection RubyResolve
-          log_file = document.log_filename
+          document.rm_workdir
+          document.rm_log
+        end
+
+        def rm_log
+          log_file = self.log_filename
           FileUtils.rm(log_file) if log_file && !log_file.blank? && File.exist?(log_file)
         end
 
+        def rm_workdir
+          workdir = self.work_dir
+          FileUtils.rmtree workdir if workdir && !workdir.blank? && Dir.exist?(workdir)
+        end
+
+        def work_dir
+          # noinspection RubyResolve
+          dir = File.join(Libis::Workflow::Config.workdir, self.id)
+          FileUtils.mkpath dir unless Dir.exist?(dir)
+          dir
+        end
+
         def run(action = :run)
           self.tasks = []
           super action
@@ -42,7 +56,7 @@ module Libis
           logger = ::Logging::Repository.instance[self.name]
           return logger if logger
           unless ::Logging::Appenders[self.name]
-            self.log_filename ||= File.join(::Libis::Workflow::Mongoid::Config[:log_dir], "#{self.name}.log")
+            self.log_filename ||= File.join(::Libis::Workflow::Mongoid::Config[:log_dir], "#{self.name}-#{self.id}.log")
             ::Logging::Appenders::File.new(
                 self.name,
                 filename: self.log_filename,

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: libis-workflow-mongoid
 version: !ruby/object:Gem::Version
-  version: 2.0.16
+  version: 2.0.17
 platform: ruby
 authors:
 - Kris Dekeyser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-20 00:00:00.000000000 Z
+date: 2016-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: libis-workflow