cpee-logging-xes-yaml 1.5.1 → 1.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b2f390c43e6c32b2abead85f3ead4fa971dda1cb24226c784a7048024c364d53
-  data.tar.gz: 4a5b8ffceb7522522568a8499d35118942dfb74a4521df7e45ebec646667cd20
+  metadata.gz: c843ee81786240dd8ba23829343e8509e81221311583f57ecf3fa651d0f0b7f5
+  data.tar.gz: fc6fa531c34788c79db9b1e7bbf834ca76e8ca6d74297a49550424223cf3dd38
 SHA512:
-  metadata.gz: 9b472f1e1258dd2c6d88156a088c1e97e79b208bea4b59df1933b5f818443094c19b16c2f6c6f9d4510d785bfb7c9c8bcb1288adcf8f148e3c8ce6d2e10efc06
-  data.tar.gz: b5d446c669f4e2e95323dd3c319d97926dca9690746b852855b5ce90b12c91711a6a63e4f4c4c62a9a6db655a68fde18d9e2c28571b57e17de1796b5078df250
+  metadata.gz: 80750e8f5fb3b423bf9122ae8bd616d491888905cbb8bd6402473bdd52182d8960280585e780f7687d502213490824d9c9b46a223ebc9ed075a4d1d02a7f6a3b
+  data.tar.gz: 2f4f600233e40c07e2caa8aca3c1355ce015642c0ef6c5417b88d0706e103bc315cc23aa48e005a19cc216c7fbc2a9ce9a7291479298432db8e25340f075ee45

data/README.md

@@ -14,7 +14,7 @@ host, or local-only access, ...), create a file log.conf and add one
 or many of the following yaml keys:
 
 ```yaml
- :port: 9250
+ :port: 9299
  :host: cpee.org
  :bind: 127.0.0.1
  :log_dir: /var/log/cpee

data/cpee-logging-xes-yaml.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee-logging-xes-yaml"
-  s.version          = "1.5.1"
+  s.version          = "1.5.3"
   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/implementation.rb

@@ -27,6 +27,7 @@ module CPEE
 
     SERVER = File.expand_path(File.join(__dir__,'implementation.xml'))
 
+    ### Pieces for writing XML{{{
     TEMPLATE_XES_XML_START = <<-END
 <log xmlns="http://www.xes-standard.org/" xes.version="2.0" xes.features="nested-attributes">
   <string key="creator" value="cpee.org"/>
@@ -59,10 +60,13 @@ module CPEE
     TEMPLATE_XES_XML_MID = <<-END
   <trace>
     END
-    TEMPLATE_XES_XML_END = <<-END
+    TEMPLATE_XES_XML_MID_END = <<-END
   </trace>
+    END
+    TEMPLATE_XES_XML_END = <<-END
 </log>
     END
+    #}}}
 
     class HeaderAndFile #{{{
       def initialize(header, io)
@@ -114,7 +118,7 @@ module CPEE
       private :append_to_outbuf
     end #}}}
 
-    class DownloadYAML < Riddl::Implementation
+    class DownloadYAML < Riddl::Implementation #{{{
       def response
         opts = @a[0]
         fname = File.join(opts[:log_dir],@r[-1])
@@ -126,7 +130,7 @@ module CPEE
           @status = 404
         end
       end
-    end
+    end #}}}
 
     class DownloadXML < Riddl::Implementation
       def self::rec_type(it) #{{{
@@ -188,24 +192,31 @@ module CPEE
       def response
         opts = @a[0]
         fname = File.join(opts[:log_dir],@r[-1]).sub(/xml$/,'yaml')
+        hname = File.join(opts[:log_dir],@r[-1]).sub(/xml$/,'header')
         if File.exist?(fname)
           body = StringIO.new
 
           body.write(TEMPLATE_XES_XML_START)
 
-          io = File.open(fname)
-          YAML.load_stream(io) do |e|
-            if trace = e.dig('log','trace')
-              xml = XML::Smart.string(TEMPLATE_XES_XML_TRC)
-              xml.register_namespace 'x', 'http://www.xes-standard.org/'
-              trace.each do |t,tv|
-                xml.find('//x:trace').each do |ele|
-                  ele.add('x:string', 'key' => t, 'value' => tv)
+          if File.exist?(hname)
+            hio = File.open(hname)
+            YAML.load_stream(hio) do |e|
+              if trace = e.dig('log','trace')
+                xml = XML::Smart.string(TEMPLATE_XES_XML_TRC)
+                xml.register_namespace 'x', 'http://www.xes-standard.org/'
+                trace.each do |t,tv|
+                  xml.find('//x:trace').each do |ele|
+                    ele.add('x:string', 'key' => t, 'value' => tv)
+                  end
                 end
+                body.write('  ' + xml.root.dump.gsub(/\n/,"\n  ") + "\n")
               end
-              body.write('  ' + xml.root.dump.gsub(/\n/,"\n  ") + "\n")
-              body.write(TEMPLATE_XES_XML_MID)
             end
+          end
+
+          io = File.open(fname)
+          body.write(TEMPLATE_XES_XML_MID)
+          YAML.load_stream(io) do |e|
             if e.dig('event')
               xml = XML::Smart.string(TEMPLATE_XES_XML_EVT)
               xml.register_namespace 'x', 'http://www.xes-standard.org/'
@@ -213,6 +224,7 @@ module CPEE
               body.write('    ' + xml.root.dump.gsub(/\n/,"\n    ") + "\n")
             end
           end
+          body.write(TEMPLATE_XES_XML_MID_END)
           body.write(TEMPLATE_XES_XML_END)
           body.rewind
 

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

@@ -210,10 +210,12 @@ module CPEE
         end
       end
 
+      event['time:timestamp'] = notification['timestamp'] || Time.now.xmlschema(4)
+
       if topic == 'task' && event_name == 'probe'
         rs = WEEL::ReadStructure.new(content['data'],{},{},{})
         rc = CPEE::Logging::extract_result(receiving) if receiving && !receiving.empty?
-        te = event.dup
+        te = event
 
         content['probes'].each do |p|
 
@@ -254,9 +256,6 @@ module CPEE
               end
               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
-                end
                 EM.defer do
                   self::notify(
                     opts,
@@ -274,19 +273,18 @@ module CPEE
           end
 
         end
-
-      end
-
-      if receiving && !receiving.empty?
-        event['data'] = receiving
-      end
-      if content['data'] && !content['data'].empty?
-        event['data'] = content['data']
+        event = nil if !event['stream:datastream']
+      else
+        if receiving && !receiving.empty?
+          event['data'] = receiving
+        end
+        if content['data'] && !content['data'].empty?
+          event['data'] = content['data']
+        end
       end
-      event['time:timestamp']= notification['timestamp'] || Time.now.xmlschema(4)
       File.open(File.join(log_dir,instance+'.xes.yaml'),'a') do |f|
         f << {'event' => event}.to_yaml
-      end
+      end unless event.nil? # :-) for task/probes
     end
 
   end

metadata

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