cpee-logging-xes-yaml 1.3.22 → 1.3.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 11477530cd78ec82f59b567b61c0755707b0630f6ccbc0b78add32d433e3e513
-  data.tar.gz: 3fc565df213205479e7b429cd75d89a5822610807c25057c9712ef647eb3e304
+  metadata.gz: 42085fa1e29bb009a3c99ef29a8a6e8d509b1f15558dc60cf6c74c9e6ec293da
+  data.tar.gz: 89130cd5b9825e6272fbf70cf90710db693842a6208522e803698b88f7083105
 SHA512:
-  metadata.gz: 990680c3ecd793d57f373a3daf61c21917180c8cf6536c108e2d1e7b3e580d363b81d77f10604f66561cc2c52e135a43a4e251121408ffa4771b4fdad266094d
-  data.tar.gz: f70324579374e104b6f326c3699135dd04eac678e9e5ff6040ff5db0b728fc638de3fe1bf8a60f7c2f851130720fe6d7372af5ab001b854a80a0e899958a8ae0
+  metadata.gz: d1087dd2be29bdef6fe61830aa1c8d5f253065cb1e82de2ed406f1b851db73017b828864bb875d4390d280c11dc76f75b8596e5c891a501c00128cb7312d72bc
+  data.tar.gz: e7f1df21643dff8e4831639887f29c6065b49614eb9530eeb9862fe2fffbcfa9292ea6e812010e9b3099881c97222883c667eee1441d9b46ed9e9fc38e2c9b58

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.22"
+  s.version          = "1.3.24"
   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

@@ -76,6 +76,7 @@ end
 module CPEE
   module Logging
 
+    # Forward event to subscriptions
     def self::notify(opts,topic,event_name,payload)
       opts[:subscriptions].each do |e,urls|
         if e == topic + '/' + event_name
@@ -122,6 +123,7 @@ module CPEE
         end
       end
     end
+
     def self::extract_annotations(where,xml)
       ret = {}
       XML::Smart::string(xml) do |doc|
@@ -290,6 +292,7 @@ module CPEE
         fname = File.join(log_dir,instance + '_' + event['id:id'] + '.probe')
         dname = File.join(log_dir,instance + '.data.json')
 
+        # Handle intrinsic data probes
         if File.exist?(fname)
           rs = WEEL::ReadStructure.new(File.exist?(dname) ? JSON::load(File::open(dname)) : {},{},{},{})
           XML::Smart::open_unprotected(fname) do |doc|
@@ -298,19 +301,24 @@ module CPEE
               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'] ||= []
-              CPEE::Logging::merge_val(event['stream:datastream'],val,pid,source)
+              # 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
           end
-          notification['datastream'] = event['stream:datastream']
-          EM.defer do
-            notification['topic'] = 'stream'
-            notification['name'] = 'extraction'
-            self::notify(opts,'stream','extraction',notification.to_json)
+          if event['stream:datastream'] && event['stream:datastream'].any?
+            notification['datastream'] = event['stream:datastream']
+            EM.defer do
+              notification['topic'] = 'stream'
+              notification['name'] = 'extraction'
+              self::notify(opts,'stream','extraction',notification.to_json)
+            end
           end
         end
       end
+      # Handle extrinsic data probes
       if topic == 'activity' && event_name == 'receiving' && receiving && !receiving.empty?
         fname = File.join(log_dir,instance + '_' + event['id:id'] + '.probe')
         dname = File.join(log_dir,instance + '.data.json')
@@ -327,11 +335,14 @@ module CPEE
                 pid = p.find('string(d:id)')
                 te['stream:datastream'] ||= []
                 val = CPEE::Logging::extract_val(rs,p.find('string(d:extractor_code)'),pid,rc) rescue nil
-                CPEE::Logging::merge_val(te['stream:datastream'],val,pid,p.find('string(d:source)'))
+                if not val.nil?
+                  # Do not add datastream entries if the dataprobes return nil
+                  CPEE::Logging::merge_val(te['stream:datastream'],val,pid,p.find('string(d:source)'))
+                end
               end
             end
           end
-          if te['stream:datastream']
+          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.22
+  version: 1.3.24
 platform: ruby
 authors:
 - Juergen eTM Mangler