cpee-logging-xes-yaml 1.3.23 → 1.3.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0826aa750d298fd8ec36f2e650295d8584d5861b9db5f9043ce7aa4bdd211f95'
-  data.tar.gz: 949622e3a7b0c311d6f3c959c7cf3e702c010d09730801b60436cbd9f3840e60
+  metadata.gz: c0718e2aa588fec306eee022e9b7919a1d75d0a5d027ca3f84e571a0f325715e
+  data.tar.gz: 6ea9758c42cb2a197fca22be6329c624e3363a0929eef354b3b949a0b1ce2fc0
 SHA512:
-  metadata.gz: e193a45610da57a8384a4e7efc9611b68e6f5280f7ffdbf03f2a0e4ea726f261c7ba5cc8d291b49a4e80e783e1f3e9a8805b9288e368fcd6d47861de1ec4fc0f
-  data.tar.gz: e9e0a9b52b398c87872f4a692ae42440e6eea1c265603c5d48f5776288a13a0af4148fa5dbf01d8cc7be6a557846045c0333e00fa163ce83d6a27b9ed741487a
+  metadata.gz: 3a559163ce46db6aeba5974dde8f70752e119b7444fa5b6964eb56cedebd014aa564e7a0c82c26e8c9533be7886fe0780e84d9b16af2d97b5dd32002f2b47aa1
+  data.tar.gz: 44d86a2b208544ae26e353b39d80d60f23e15ddf7521104448ceec6494ba6a32ee6ab118e7120d26bef80513752609f63851c4710be6fc80117d07f4bf84ac8b

data/cpee-logging-xes-yaml.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee-logging-xes-yaml"
-  s.version          = "1.3.23"
+  s.version          = "1.3.26"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3.0-or-later"
   s.summary          = "Logging for the cloud process execution engine (cpee.org)"

data/lib/cpee-logging-xes-yaml/tools.rb

@@ -209,6 +209,12 @@ module CPEE
       f.write(JSON.generate(json))
       f.close
     end
+    def self::load_values(where)
+      File.open(where,'r') do |f|
+        f.flock(File::LOCK_EX)
+        return JSON::load(f)
+      end
+    end
 
     def self::forward(opts,topic,event_name,payload)
       if topic == 'state' && event_name == 'change'
@@ -294,16 +300,16 @@ module CPEE
 
         # Handle intrinsic data probes
         if File.exist?(fname)
-          rs = WEEL::ReadStructure.new(File.exist?(dname) ? JSON::load(File::open(dname)) : {},{},{},{})
+          rs = WEEL::ReadStructure.new(File.exist?(dname) ? CPEE::Logging::load_values(dname) : {},{},{},{})
           XML::Smart::open_unprotected(fname) do |doc|
             doc.register_namespace 'd', 'http://cpee.org/ns/description/1.0'
             doc.find('//d:probe[d:extractor_type="intrinsic"]').each do |p|
               pid    = p.find('string(d:id)')
               source = p.find('string(d:source)')
               val = CPEE::Logging::extract_val(rs,p.find('string(d:extractor_code)'),pid,nil) rescue nil
-              event['stream:datastream'] ||= []
               # Do not add datastream entries if the dataprobes return nil
               if val != nil
+                event['stream:datastream'] ||= []
                 CPEE::Logging::merge_val(event['stream:datastream'],val,pid,source)
               end
             end
@@ -326,7 +332,7 @@ module CPEE
         if File.exist?(fname)
           te = event.dup
 
-          rs = WEEL::ReadStructure.new(File.exist?(dname) ? JSON::load(File::open(dname)) : {},{},{},{})
+          rs = WEEL::ReadStructure.new(File.exist?(dname) ? CPEE::Logging::load_values(dname) : {},{},{},{})
           XML::Smart::open_unprotected(fname) do |doc|
             doc.register_namespace 'd', 'http://cpee.org/ns/description/1.0'
             if doc.find('//d:probe/d:extractor_type[.="extrinsic"]').any?
@@ -342,7 +348,7 @@ module CPEE
               end
             end
           end
-          if te['stream:datastream'] && te['stream:datastream'].any? 
+          if te['stream:datastream'] && te['stream:datastream'].any?
             te['cpee:lifecycle:transition'] = 'stream/data'
             File.open(File.join(log_dir,instance+'.xes.yaml'),'a') do |f|
               f << {'event' => te}.to_yaml

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cpee-logging-xes-yaml
 version: !ruby/object:Gem::Version
-  version: 1.3.23
+  version: 1.3.26
 platform: ruby
 authors:
 - Juergen eTM Mangler