cpee-logging-xes-yaml 1.0.1 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5233866b6ce08af2156e106e2813f40d684833933726adfea60a1297f0fef556
-  data.tar.gz: 93cbef9a422a9388bed75adb86a04eec7faa06036540e6190cc41ec07658a664
+  metadata.gz: 897f6d719b02a41bbec8577cbcc0cfb0c21d45e4c82a569903a9d2260ec95ce6
+  data.tar.gz: 52a03e45692b299d2548a132c5549787f04dc935268b467fb9c47dd777a26ac5
 SHA512:
-  metadata.gz: 55569ea8f23429cb63bf6d8d6df57064a9a3982ba66876fe36d8b400937c7d57a8dcc2c7ed9f833324541739338dfa1ff24198a4dae35888745c53a3fcf54132
-  data.tar.gz: c28f5c119e48cc76a3edef1b4649ed9d5f0ba6f75b848b0a1b734018de5afa45e0d6be918fd40d940667742b44c5b576f2297b7b210935519ba4ce778ebb1d62
+  metadata.gz: 4dbab93362de5702354db2b62ccbe6fe5a2bf4d8305f87b9ccef877d542a62e62dc5804cae5b9d059c7930fdc1e2063dcce2d132fcf8a2e2b6418c7146e6db5c
+  data.tar.gz: f1412da8132c5f8b7f67643ab8226a09262cef99f34b78f9de9a8941a5a3b947340acb85967b5f645c812853dd3c1740f5a4c34ea53040c34b1f3433d230d714

data/README.md

@@ -20,7 +20,7 @@ or many of the following yaml keys:
  :log_dir: /var/log/cpee
 ```
 
-To connec the cpee to the log, one of two things can be done: (1) add a handler to
+To connect the cpee to the log, one of two things can be done: (1) add a handler to
 a testset/template:
 
 ```xml
@@ -31,6 +31,8 @@ a testset/template:
       <events topic="endpoints">change</events>
       <events topic="attributes">change</events>
       <events topic="task">instantiation</events>
+      <events topic="description">change</events>
+      <events topic="state">change</events>
     </handler>
   </handlers>
 ```
@@ -46,7 +48,7 @@ Riddl::Server.new(CPEE::SERVER, options) do
 end.loop!
 ```
 
-to the server (or alternatively to a log.conf with :notification_init
+to the server (or alternatively to a cpee.conf with :notification_init
 beeing a top-level yaml key). Then add a subscription file to
 notifications/logging/subscription.xml
 
@@ -66,6 +68,12 @@ notifications/logging/subscription.xml
   <topic id="attributes">
     <event>change</event>
   </topic>
+  <topic id="description">
+    <event>change</event>
+  </topic>
+  <topic id="state">
+    <event>change</event>
+  </topic>
   <topic id="task">
     <event>instantiation</event>
   </topic>

data/cpee-logging-xes-yaml.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee-logging-xes-yaml"
-  s.version          = "1.0.1"
+  s.version          = "1.0.5"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3.0"
   s.summary          = "Logging for the cloud process execution engine (cpee.org)"
@@ -22,5 +22,5 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency 'riddl', '~> 0.99'
   s.add_runtime_dependency 'json', '~> 2.1'
-  s.add_runtime_dependency 'cpee', '~> 1', '>= 1.5'
+  s.add_runtime_dependency 'cpee', '~> 2.1', '>= 2.1.4'
 end

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

@@ -45,7 +45,7 @@ module CPEE
         event = {}
         event["concept:instance"] = instancenr
         event["concept:name"] = content["label"] if content["label"]
-        if notification["endpoint"]
+        if content["endpoint"]
           event["concept:endpoint"] = content["endpoint"]
         end
         event["id:id"] = (activity.nil? || activity == "") ? 'external' : activity
@@ -61,6 +61,8 @@ module CPEE
             event["lifecycle:transition"] = "start"
         end
         event["cpee:lifecycle:transition"] = "#{topic}/#{event_name}"
+        event["cpee:state"] = content['state'] if content['state']
+        event["cpee:description"] = content['dslx'] if content['dslx']
         data_send = ((parameters["arguments"].nil? ? [] : parameters["arguments"]) rescue [])
         event["data"] = {"data_send" => data_send} unless data_send.empty?
         if content['changed']&.any?

data/tools/cpee-logging-xes-yaml

@@ -35,20 +35,16 @@ def follow(fname,io,copy,deep=0)
     if name = e.dig('log','trace','cpee:name')
       puts " " * deep + name + " (#{File.basename(fname,'.xes.yaml')}) - #{e.dig('log','trace','concept:name')}"
     end
-    if e.dig('event','concept:endpoint') == 'https://centurio.work/flow/start/url/' && e.dig('event','cpee:lifecycle:transition') == 'task/instantiation'
+    if e.dig('event','cpee:lifecycle:transition') == 'task/instantiation'
       base = e.dig('event','data','data_receiver')
       val = base.dig('CPEE-INSTANCE') rescue nil
       if val.nil?
         val = File.basename(base)
       end
       uuid = base.dig('CPEE-INSTANCE-UUID') rescue nil
-      unless uuid
-        res = Typhoeus.get(File.join('https://centurio.work/flow/engine/',val,'/properties/values/attributes/uuid/'))
-        if res.success?
-          uuid = XML::Smart.string(res.body).find('string(/*)')
-        end
+      if uuid
+        react File.dirname(fname) + "/#{uuid}.xes.yaml",copy,deep + 2
       end
-      react File.dirname(fname) + "/#{uuid}.xes.yaml",copy,deep + 2
     end
   end
 end
@@ -98,9 +94,9 @@ else
 end
 
 if command == 'new'
-  if !File.exists?(p1)
-    FileUtils.cp_r(File.join(curpath,'..','server'),p1)
-    FileUtils.mkdir(File.join(p1,'logs')) rescue nil
+  if !File.exists?(dir)
+    FileUtils.cp_r(File.join(curpath,'..','server'),dir)
+    FileUtils.mkdir(File.join(dir,'logs')) rescue nil
   else
     puts 'Directory already exists.'
   end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: cpee-logging-xes-yaml
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.5
 platform: ruby
 authors:
 - Juergen eTM Mangler
 - Florian Stertz
-autorequire: 
+autorequire:
 bindir: tools
 cert_chain: []
-date: 2020-10-05 00:00:00.000000000 Z
+date: 2021-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riddl
@@ -45,20 +45,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '2.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: 2.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '2.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: 2.1.4
 description: see http://cpee.org
 email: juergen.mangler@gmail.com
 executables:
@@ -81,7 +81,7 @@ homepage: http://cpee.org/
 licenses:
 - LGPL-3.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -96,8 +96,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.2.22
+signing_key:
 specification_version: 4
 summary: Logging for the cloud process execution engine (cpee.org)
 test_files: []