cpee 1.5.13 → 1.5.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 01b8b9a828ac632cc2f725719661182a9f775f46438f543c65d00081494dae90
-  data.tar.gz: 14f6926c8a7b1faee502a18adf708ce2f0da55b15496f93d54370c9fa57c246c
+  metadata.gz: e9032110f699ad05cee7dfc9700945ae55cd13421989df985912f72ebe16330b
+  data.tar.gz: 66203da69e541f8339897c365ebeaae6824f51ea3d34bcb0de02a9fce6cc4b2c
 SHA512:
-  metadata.gz: aefcc1e8ba225decbfe6cb3e20496ac31595436c1971f5c7650d1fd6e5b066458850852b41593f3c9fbb52870a102807d07814e5184eaf03f10fa9e9b621feb6
-  data.tar.gz: a2def60686fbbefb7810b490d88f2e58faf13b3e3da08beee999c46dac5ac2df91457c80099e014cfe0f8ebe334bf4e89c466fdee7ad56e2c7d9956e05d31504
+  metadata.gz: 339b3684647593c7159f4e3902f75eda6116c93f3ba8caed0321908f7d9c6063437f2d1c4aa511e1a9c26572866b3ff86866e6fbb720de86e37ed37ed09b0675
+  data.tar.gz: 9e664463869e9d18c10c54cc12265905fc79b26e050ea1662545811343a63c5d28ef4846632e6b785a4076662d53867dcf0da5862604db7d8efd6187c212fa01

data/cockpit/themes/extended/theme.js

@@ -1290,6 +1290,6 @@ function WFAdaptorManifestation(adaptor) {
     }//}}}
   };  /*}}}*/
   this.elements.scripts = { /*{{{*/
-    'description': [self.adaptor.theme_dir + 'rngs/update.rng',self.adaptor.theme_dir + 'rngs/finalize.rng']
+    'description': [self.adaptor.theme_dir + 'rngs/scripts.rng']
   }; /*}}}*/
 }

data/cpee.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee"
-  s.version          = "1.5.13"
+  s.version          = "1.5.15"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3.0"
   s.summary          = "Preliminary release of cloud process execution engine (cpee). If you just need workflow execution, without a rest/xmpp service exposing it, then use WEEL"

data/log/xes_yaml.rb

@@ -9,8 +9,8 @@ require 'time'
 
 class Logging < Riddl::Implementation #{{{
   def doc(topic,event_name,log_dir,template,instancenr,notification)
-    uuid = notification['instance_uuid']
-    return unless uuid
+    instance = notification['instance_uuid']
+    return unless instance
 
     activity = notification['activity']
     parameters = notification['parameters']
@@ -18,9 +18,9 @@ class Logging < Riddl::Implementation #{{{
 
     log = YAML::load(File.read(template))
     log["log"]["trace"]["concept:name"] ||= instancenr
-    log["log"]["trace"]["cpee:name"] ||= notification['instance_name'] if notification["instance_name"]
-    log["log"]["trace"]["cpee:uuid"] ||= notification['instance_uuid'] if notification["instance_uuid"]
-    File.open(File.join(log_dir,uuid+'.xes.yaml'),'w'){|f| f.puts log.to_yaml} unless File.exists? File.join(log_dir,uuid+'.xes.yaml')
+    log["log"]["trace"]["cpee:name"] ||= notification['instance_name'] if notification['instance_name']
+    log["log"]["trace"]["cpee:instance"] ||= instance
+    File.open(File.join(log_dir,instance+'.xes.yaml'),'w'){|f| f.puts log.to_yaml} unless File.exists? File.join(log_dir,instance+'.xes.yaml')
     event = {}
     event["concept:instance"] = instancenr
     event["concept:name"] = notification["label"] if notification["label"]
@@ -28,7 +28,9 @@ class Logging < Riddl::Implementation #{{{
       event["concept:endpoint"] = notification["endpoint"]
     end
     event["id:id"] = (activity.nil? || activity == "") ? 'external' : activity
-    event["cpee:uuid"] = notification['instance_uuid'] if notification["instance_uuid"]
+    event["cpee:activity"] = event["id:id"]
+    event["cpee:activity_uuid"] = notification['activity_uuid'] if notification['activity_uuid']
+    event["cpee:instance"] = instance
     case event_name
       when 'receiving', 'change', 'instantiation'
         event["lifecycle:transition"] = "unknown"
@@ -62,7 +64,7 @@ class Logging < Riddl::Implementation #{{{
       end
     end
     event["time:timestamp"]= event['cpee:timestamp'] || Time.now.strftime("%Y-%m-%dT%H:%M:%S.%L%:z")
-    File.open(File.join(log_dir,uuid+'.xes.yaml'),'a') do |f|
+    File.open(File.join(log_dir,instance+'.xes.yaml'),'a') do |f|
       f << {'event' => event}.to_yaml
     end
     nil

data/server/handlerwrappers/default.rb

@@ -43,6 +43,7 @@ class DefaultHandlerWrapper < WEEL::HandlerWrapperBase
     @handler_passthrough = nil
     @handler_returnValue = nil
     @handler_returnOptions = nil
+    @handler_activity_uuid = Digest::MD5.hexdigest(Kernel::rand().to_s)
     @label = ''
   end # }}}
 
@@ -133,7 +134,7 @@ class DefaultHandlerWrapper < WEEL::HandlerWrapperBase
     @sensors = parameters.dig(:stream,:sensors)
     @aggregators = parameters.dig(:stream,:aggregators)
     @costs = parameters.dig(:stream,:costs)
-    @controller.notify("activity/calling", :instance => @controller.instance, :instance_uuid => @controller.uuid, :label => @label, :instance_name => @controller.info, :activity => @handler_position, :passthrough => passthrough, :endpoint => @handler_endpoint, :parameters => parameters, :timestamp => Time.now.strftime("%Y-%m-%dT%H:%M:%S.%L%:z"), :attributes => @controller.attributes_translated)
+    @controller.notify("activity/calling", :activity_uuid => @handler_activity_uuid, :instance => @controller.instance, :instance_uuid => @controller.uuid, :label => @label, :instance_name => @controller.info, :activity => @handler_position, :passthrough => passthrough, :endpoint => @handler_endpoint, :parameters => parameters, :timestamp => Time.now.strftime("%Y-%m-%dT%H:%M:%S.%L%:z"), :attributes => @controller.attributes_translated)
     if passthrough.to_s.empty?
       proto_curl parameters
     else
@@ -166,15 +167,15 @@ class DefaultHandlerWrapper < WEEL::HandlerWrapperBase
   end # }}}
 
   def inform_activity_done # {{{
-    @controller.notify("activity/done", :endpoint => @handler_endpoint, :instance => @controller.instance, :label => @label, :instance_name => @controller.info, :instance_uuid => @controller.uuid, :activity => @handler_position, :timestamp => Time.now.strftime("%Y-%m-%dT%H:%M:%S.%L%:z"), :attributes => @controller.attributes_translated)
+    @controller.notify("activity/done", :activity_uuid => @handler_activity_uuid, :endpoint => @handler_endpoint, :instance => @controller.instance, :label => @label, :instance_name => @controller.info, :instance_uuid => @controller.uuid, :activity => @handler_position, :timestamp => Time.now.strftime("%Y-%m-%dT%H:%M:%S.%L%:z"), :attributes => @controller.attributes_translated)
   end # }}}
   def inform_activity_manipulate # {{{
-    @controller.notify("activity/manipulating", :endpoint => @handler_endpoint, :instance => @controller.instance, :label => @label, :instance_name => @controller.info, :instance_uuid => @controller.uuid, :activity => @handler_position, :timestamp => Time.now.strftime("%Y-%m-%dT%H:%M:%S.%L%:z"), :attributes => @controller.attributes_translated)
+    @controller.notify("activity/manipulating", :activity_uuid => @handler_activity_uuid, :endpoint => @handler_endpoint, :instance => @controller.instance, :label => @label, :instance_name => @controller.info, :instance_uuid => @controller.uuid, :activity => @handler_position, :timestamp => Time.now.strftime("%Y-%m-%dT%H:%M:%S.%L%:z"), :attributes => @controller.attributes_translated)
   end # }}}
   def inform_activity_failed(err) # {{{
     puts err.message
     puts err.backtrace
-    @controller.notify("activity/failed", :endpoint => @handler_endpoint, :label => @label, :instance_name => @controller.info, :instance => @controller.instance, :instance_uuid => @controller.uuid, :activity => @handler_position, :message => err.message, :line => err.backtrace[0].match(/(.*?):(\d+):/)[2], :where => err.backtrace[0].match(/(.*?):(\d+):/)[1], :timestamp => Time.now.strftime("%Y-%m-%dT%H:%M:%S.%L%:z"), :attributes => @controller.attributes_translated)
+    @controller.notify("activity/failed", :activity_uuid => @handler_activity_uuid, :endpoint => @handler_endpoint, :label => @label, :instance_name => @controller.info, :instance => @controller.instance, :instance_uuid => @controller.uuid, :activity => @handler_position, :message => err.message, :line => err.backtrace[0].match(/(.*?):(\d+):/)[2], :where => err.backtrace[0].match(/(.*?):(\d+):/)[1], :timestamp => Time.now.strftime("%Y-%m-%dT%H:%M:%S.%L%:z"), :attributes => @controller.attributes_translated)
   end # }}}
   def inform_manipulate_change(status,changed_dataelements,changed_endpoints,dataelements,endpoints) # {{{
     unless status.nil?
@@ -192,10 +193,10 @@ class DefaultHandlerWrapper < WEEL::HandlerWrapperBase
   end # }}}
 
   def vote_sync_after # {{{
-    @controller.call_vote("activity/syncing_after", :endpoint => @handler_endpoint, :instance => @controller.instance, :instance_uuid => @controller.uuid, :activity => @handler_position, :timestamp => Time.now.strftime("%Y-%m-%dT%H:%M:%S.%L%:z"))
+    @controller.call_vote("activity/syncing_after", :activity_uuid => @handler_activity_uuid, :endpoint => @handler_endpoint, :instance => @controller.instance, :instance_uuid => @controller.uuid, :activity => @handler_position, :timestamp => Time.now.strftime("%Y-%m-%dT%H:%M:%S.%L%:z"))
   end # }}}
   def vote_sync_before(parameters=nil) # {{{
-    @controller.call_vote("activity/syncing_before", :endpoint => @handler_endpoint, :instance => @controller.instance, :instance_uuid => @controller.uuid, :activity => @handler_position, :parameters => parameters, :timestamp => Time.now.strftime("%Y-%m-%dT%H:%M:%S.%L%:z"))
+    @controller.call_vote("activity/syncing_before", :activity_uuid => @handler_activity_uuid, :endpoint => @handler_endpoint, :instance => @controller.instance, :instance_uuid => @controller.uuid, :activity => @handler_position, :parameters => parameters, :timestamp => Time.now.strftime("%Y-%m-%dT%H:%M:%S.%L%:z"))
   end # }}}
 
   def simplify_result(result)
@@ -254,13 +255,13 @@ class DefaultHandlerWrapper < WEEL::HandlerWrapperBase
   end
 
   def callback(result=nil,options={})
-    @controller.notify("activity/receiving", :instance => @controller.instance, :label => @label, :instance_name => @controller.info, :instance_uuid => @controller.uuid, :activity => @handler_position, :endpoint => @handler_endpoint, :received => structurize_result(result), :timestamp => Time.now.strftime("%Y-%m-%dT%H:%M:%S.%L%:z"), :attributes => @controller.attributes_translated, :sensors => @sensors, :aggregators => @aggregators, :costs => @costs)
+    @controller.notify("activity/receiving", :activity_uuid => @handler_activity_uuid, :instance => @controller.instance, :label => @label, :instance_name => @controller.info, :instance_uuid => @controller.uuid, :activity => @handler_position, :endpoint => @handler_endpoint, :received => structurize_result(result), :timestamp => Time.now.strftime("%Y-%m-%dT%H:%M:%S.%L%:z"), :attributes => @controller.attributes_translated, :sensors => @sensors, :aggregators => @aggregators, :costs => @costs)
     result = simplify_result(result)
     @handler_returnValue = result
     @handler_returnOptions = options
     if options['CPEE_UPDATE']
       if options['CPEE_UPDATE_STATUS']
-        @controller.notify("activity/status", :instance => @controller.instance, :instance_uuid => @controller.uuid, :activity => @handler_position, :endpoint => @handler_endpoint, :status => options['CPEE_UPDATE_STATUS'], :timestamp => Time.now.strftime("%Y-%m-%dT%H:%M:%S.%L%:z"), :attributes => @controller.attributes_translated)
+        @controller.notify("activity/status", :activity_uuid => @handler_activity_uuid, :instance => @controller.instance, :instance_uuid => @controller.uuid, :activity => @handler_position, :endpoint => @handler_endpoint, :status => options['CPEE_UPDATE_STATUS'], :timestamp => Time.now.strftime("%Y-%m-%dT%H:%M:%S.%L%:z"), :attributes => @controller.attributes_translated)
       end
       @handler_continue.continue WEEL::Signal::Again
     else

data/server/resources/transformation_dslx.xsl

@@ -384,7 +384,7 @@
         <xsl:apply-templates select="d:*" mode="plainmulti"/>
         <xsl:text>]</xsl:text>
       </xsl:when>
-      <xsl:when test="count(*) &gt; 0 and name()='cost'">
+      <xsl:when test="count(*) &gt; 0 and name()='costs'">
         <xsl:text>[</xsl:text>
         <xsl:apply-templates select="d:*" mode="plainmulti"/>
         <xsl:text>]</xsl:text>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cpee
 version: !ruby/object:Gem::Version
-  version: 1.5.13
+  version: 1.5.15
 platform: ruby
 authors:
 - Juergen eTM Mangler
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: tools
 cert_chain: []
-date: 2019-11-22 00:00:00.000000000 Z
+date: 2019-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riddl