cpee 2.1.49 → 2.1.51

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 34164853ededc651de8bd49042f1fbd395a2085897ae8f0de3d589f6896e55a4
-  data.tar.gz: 94547c5e075aae343ac0bcd01cd99f31907841cf0621d3623d2dc41a30aab8cb
+  metadata.gz: 53d9392ee2d94e307e588b467e9a435901f8d231d42f84ff326432444764be99
+  data.tar.gz: d0f08d2fc5100b961f218e5c1890931d894bc9d3ed844e880ca187fffb3342d2
 SHA512:
-  metadata.gz: 1eb722ee4a2d1721c70af726a98c1ef4dc41ce553b4332aa45eb6c2a5f96d1081f860b0c67bd90ba88f0275391e178ec063e6a77eeab54d55ed96437fc93d2aa
-  data.tar.gz: d144450ff15ec4c4856d41334e119f60a56c1e8d27eeafc63540cb11f01bb9dec3bcbfa9615a3d83001e24d806b514f80aa5f5b841f16799416c3f12338ce464
+  metadata.gz: 56677348739cd49fc763e867d9d6d464afa1183fe5220277bd2141410b46ddd065320ae4e11c8ed469a82107d57a3f0afc6148624d71c88f6ba1bf961bd9af9a
+  data.tar.gz: 4bcf1ce059ae0839862910e620697907a045ac925ffd30c7212d7b8ff8819f9f6c6a2eb845365ab3c7887db9d0e6d567122b98ce77699d3a23fbbafa2c2ff790

data/cockpit/css/wfadaptor.css

@@ -22,6 +22,7 @@
   --wfadaptor-exec-vote-text: #73d216;
   --wfadaptor-highlight: #0081c7;
   --wfadaptor-base: #000000;
+  --wfadaptor-base-light: #A9A9A9;
   --wfadaptor-label: #d4d4d4;
   --wfadaptor-mark: #d4d4d4;
   --wfadaptor-selected: #f57900;
@@ -134,6 +135,17 @@ svg .standfat {
   stroke-opacity:1;
   stroke-dasharray:none;
 }
+svg .greyfat {
+  fill: var(--wfadaptor-background);
+  fill-opacity:1;
+  stroke: var(--wfadaptor-base-light);
+  stroke-width:3;
+  stroke-linecap:round;
+  stroke-linejoin:round;
+  stroke-miterlimit:4;
+  stroke-opacity:1;
+  stroke-dasharray:none;
+}
 svg .standfat.menu {
   stroke: var(--wfadaptor-menu);
 }
@@ -170,6 +182,17 @@ svg .black {
   stroke-opacity:1;
   stroke-dasharray:none;
 }
+svg .grey {
+  fill: var(--wfadaptor-base-light);
+  fill-opacity:1;
+  stroke: var(--wfadaptor-base-light);
+  stroke-width: 1.6;
+  stroke-linecap:round;
+  stroke-linejoin:round;
+  stroke-miterlimit:4;
+  stroke-opacity:1;
+  stroke-dasharray:none;
+}
 
 svg .marked text.label {
   color: var(--wfadaptor-label);

data/cpee.gemspec

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

data/lib/cpee/persistence.rb

@@ -82,7 +82,9 @@ module CPEE
     end
 
     def self::new_object(opts)
-      opts[:redis].zrevrange(@@obj + 's', 0, 0).first.to_i + 1
+      id = opts[:redis].zrevrange(@@obj + 's', 0, 0).first.to_i + 1
+      opts[:redis].zadd(@@obj + 's',id,id)
+      id
     end
 
     def self::keys(id,opts,item=nil)

data/server/executionhandlers/ruby/connection.rb

@@ -20,6 +20,7 @@ require 'get_process_mem'
 class ConnectionWrapper < WEEL::ConnectionWrapperBase
   def self::loop_guard(arguments,id,count) # {{{
     controller = arguments[0]
+    return false if controller.attributes['nednoamol']
     tsn = Time.now
     tso = controller.loop_guard[id][:timestamp] rescue Time.now
     controller.loop_guard[id] = { :count => count, :timestamp => tsn }
@@ -132,7 +133,7 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
     end
 
     status = result = headers = nil
-    catch :no_mock do
+    begin
       tendpoint = @handler_endpoint.sub(/^http(s)?-(get|put|post|delete):/,'http\\1:')
       type = $2 || parameters[:method] || 'post'
 
@@ -142,11 +143,20 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
       @controller.callback(self,callback,:'activity-uuid' => @handler_activity_uuid, :label => @label, :activity => @handler_position)
 
       status, result, headers = client.request type => params
+      @guard_files += result
+
       if status == 561
         @handler_endpoint = @handler_endpoint_orig
-        throw :no_mock
+        params.delete_if { |p| p.name == 'original_endpoint' }
+        params.each do |p|
+          if p.name == 'attributes'
+            t = JSON::parse(p.value) rescue {}
+            t['mock'] = @controller.attributes['mock']
+            p.value = t.to_json
+          end
+        end
       end
-    end
+    end while status == 561
 
     if status < 200 || status >= 300
       headers['CPEE_SALVAGE'] = true
@@ -274,7 +284,7 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
         end
       end
     else
-      Riddl::Parameter::Array[*result]
+      result = Riddl::Parameter::Array[*result]
     end
     if result.is_a? String
       enc = detect_encoding(result)
@@ -345,6 +355,7 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
     recv = structurize_result(result)
     @controller.notify("activity/receiving", :'activity-uuid' => @handler_activity_uuid, :label => @label, :activity => @handler_position, :endpoint => @handler_endpoint, :received => recv, :annotations => @anno)
     @guard_files += result
+
     @handler_returnValue = simplify_result(result)
     @handler_returnOptions = options
     if options['CPEE_INSTANTIATION']
@@ -372,13 +383,15 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
   end
 
   def mem_guard() #{{{
-    @guard_files.each do |p|
+    @guard_files.delete_if do |p|
       if p&.respond_to?(:close)
         p.close
       elsif  p&.value&.respond_to?(:close)
         p.value.close
       end
+      true
     end
+    GC.start
   end #}}}
 
   def test_condition(mr,code,args)

data/server/routing/end.pid

@@ -1 +1 @@
-383721
+1105683

data/server/routing/forward-events-00.pid

@@ -1 +1 @@
-383730
+1105692

data/server/routing/forward-votes.pid

@@ -1 +1 @@
-383727
+1105689

data/server/routing/persist.pid

@@ -1 +1 @@
-383724
+1105686

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cpee
 version: !ruby/object:Gem::Version
-  version: 2.1.49
+  version: 2.1.51
 platform: ruby
 authors:
 - Juergen eTM Mangler
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: tools
 cert_chain: []
-date: 2023-08-24 00:00:00.000000000 Z
+date: 2023-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riddl