cpee 2.1.41 → 2.1.43

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d269456c4ed16bc2f73b834e4c680e93c6f187e4b4ae24da9b5158bf0df6f9c0
-  data.tar.gz: fc4b08c08ef7797727d14f02293c1087fc3ff4ed30ceb9febd86e07deec058c9
+  metadata.gz: efe2b979ffa5688e94ddc6d344f22a000ec05ee8431829a540a1e029eb6447e0
+  data.tar.gz: e806711116591e7cbf37132ca4950d6b824b90b85fe9806b8d0a2aa2186fe43d
 SHA512:
-  metadata.gz: 29cd768da588727ae216e0d5c4474b791db7ac957e8b4b62035223fc8ac106efefaae8cababbac13dad6f77b4e76126dac5bf6e735fb9ad5b6151d04900c3d8b
-  data.tar.gz: 0ac57fa8dadd564b2c4eb3fa16e82e7694c7bafcee4f9276274f613234fe2c385307bd2b80da17016f81b471002f782d4bff2e31524a3354e06a9af6a56488ab
+  metadata.gz: 7216bbfcc02ef6e23c085bdbe521f8f84d39c752415bc2e46498fcd658b88eed491e1387bbd85147b1defd9cc49b8872ff82d22ceabe9e4dd4d4035c25c53bf5
+  data.tar.gz: 25de4d62af41f018535725dbd93b493c0e12161553c070f6c1db6dcadcca4dac9621d442eabdb8c9cfc33783e7e622cc7c8e76682a13542c262bcb6d0f0c9ddd

data/cpee.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee"
-  s.version          = "2.1.41"
+  s.version          = "2.1.43"
   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."
@@ -21,10 +21,10 @@ Gem::Specification.new do |s|
   s.email            = 'juergen.mangler@gmail.com'
   s.homepage         = 'http://cpee.org/'
 
-  s.add_runtime_dependency 'riddl', '~> 0.114'
+  s.add_runtime_dependency 'riddl', '~> 0.126'
   s.add_runtime_dependency 'weel', '~> 1.99', '>= 1.99.99'
   s.add_runtime_dependency 'highline', '~> 2.0'
-  s.add_runtime_dependency 'redis', '~> 4.1'
+  s.add_runtime_dependency 'redis', '~> 5.0'
   s.add_runtime_dependency 'rubyzip', '~>2'
   s.add_runtime_dependency 'charlock_holmes', '~>0'
   s.add_runtime_dependency 'mimemagic', '~>0'

data/lib/cpee/implementation.rb

@@ -70,8 +70,8 @@ module CPEE
     opts[:watchdog_start_off]         ||= false
     opts[:infinite_loop_stop]         ||= 10000
     opts[:workers]                    ||= 1
-    opts[:workers_single]             ||= ['end','forward-votes']
-    opts[:workers_multi]              ||= ['persist','forward-events']
+    opts[:workers_single]             ||= ['end','persist','forward-votes']
+    opts[:workers_multi]              ||= ['forward-events']
 
     opts[:dashing_frequency]          ||= 3
     opts[:dashing_target]             ||= nil
@@ -212,12 +212,13 @@ module CPEE
         next if File.exist?(s + '.lock')
         pid = (File.read(s + '.pid').to_i rescue nil)
         if (pid.nil? || !(Process.kill(0, pid) rescue false))
-          if url.nil?
-            system "#{s}.rb -p \"#{path}\" -d #{db} restart 1>/dev/null 2>&1"
+          cmd = if url.nil?
+            "-p \"#{path}\" -d #{db} -w #{workers} restart 1>/dev/null 2>&1"
           else
-            system "#{s}.rb -u \"#{url}\" -d #{db} restart 1>/dev/null 2>&1"
+            "-u \"#{url}\" -d #{db} -w #{workers} restart 1>/dev/null 2>&1"
           end
-          puts "➡ Service #{File.basename(s)} started ..."
+          system "#{s}.rb " + cmd + " 1>/dev/null 2>&1"
+          puts "➡ Service #{File.basename(s)} (#{cmd}) started ..."
         end
       end
       workers_multi.each do |s|
@@ -338,7 +339,7 @@ module CPEE
         :state => 'ready',
         :attributes => CPEE::Persistence::extract_list(id,opts,'attributes').to_h
       }
-      CPEE::Message::send(:event,'state/change',File.join(opts[:url],'/'),id,uuid,name,content,redis,opts[:workers])
+      CPEE::Message::send(:event,'state/change',File.join(opts[:url],'/'),id,uuid,name,content,redis)
 
       @headers << Riddl::Header.new("CPEE-INSTANCE", id.to_s)
       @headers << Riddl::Header.new("CPEE-INSTANCE-URL", File.join(opts[:url].to_s,id.to_s,'/'))

data/server/executionhandlers/ruby/controller.rb

@@ -59,23 +59,27 @@ class Controller
       @psredis = @opts[:redis_dyn].call "Instance #{@id} Callback Response"
       @psredis.psubscribe('callback-response:*','callback-end:*') do |on|
         on.pmessage do |pat, what, message|
-          if pat == 'callback-response:*' && @callback_keys.has_key?(what[18..-1])
-            index = message.index(' ')
-            mess = message[index+1..-1]
-            instance = message[0...index]
-            m = JSON.parse(mess)
-            resp = []
-            m['content']['values'].each do |e|
-              if e[1][0] == 'simple'
-                resp << Riddl::Parameter::Simple.new(e[0],e[1][1])
-              elsif e[1][0] == 'complex'
-                resp << Riddl::Parameter::Complex.new(e[0],e[1][1],File.open(e[1][2]))
+          if pat == 'callback-response:*'
+            _, worker, identifier = what.split(':')
+            if @callback_keys.has_key?(identifier)
+              index = message.index(' ')
+              mess = message[index+1..-1]
+              instance = message[0...index]
+              m = JSON.parse(mess)
+              resp = []
+              m['content']['values'].each do |e|
+                if e[1][0] == 'simple'
+                  resp << Riddl::Parameter::Simple.new(e[0],e[1][1])
+                elsif e[1][0] == 'complex'
+                  resp << Riddl::Parameter::Complex.new(e[0],e[1][1],File.open(e[1][2]))
+                end
               end
+              @callback_keys[identifier].send(:callback,resp,m['content']['headers'])
             end
-            @callback_keys[what[18..-1]].send(:callback,resp,m['content']['headers'])
           end
           if pat == 'callback-end:*'
-            @callback_keys.delete(what[13..-1])
+            _, worker, identifier = what.split(':')
+            @callback_keys.delete(identifier)
           end
         end
       end

data/server/routing/end.rb

@@ -23,7 +23,8 @@ Daemonite.new do |opts|
   opts[:runtime_opts] += [
     ["--url=URL", "-uURL", "Specify redis url", ->(p){ opts[:redis_url] = p }],
     ["--path=PATH", "-pPATH", "Specify redis path, e.g. /tmp/redis.sock", ->(p){ opts[:redis_path] = p }],
-    ["--db=DB", "-dDB", "Specify redis db, e.g. 1", ->(p) { opts[:redis_db] = p.to_i }]
+    ["--db=DB", "-dDB", "Specify redis db, e.g. 1", ->(p) { opts[:redis_db] = p.to_i }],
+    ["--workers=NUM", "-wNUM", "Number of workers that are expected, e.g. 3", ->(p) { opts[:workers] = p.to_i }]
   ]
 
   on startup do

data/server/routing/forward-votes.rb

@@ -49,7 +49,8 @@ Daemonite.new do |opts|
   opts[:runtime_opts] += [
     ["--url=URL", "-uURL", "Specify redis url", ->(p){ opts[:redis_url] = p }],
     ["--path=PATH", "-pPATH", "Specify redis path, e.g. /tmp/redis.sock", ->(p){ opts[:redis_path] = p }],
-    ["--db=DB", "-dDB", "Specify redis db, e.g. 1", ->(p) { opts[:redis_db] = p.to_i }]
+    ["--db=DB", "-dDB", "Specify redis db, e.g. 1", ->(p) { opts[:redis_db] = p.to_i }],
+    ["--workers=NUM", "-wNUM", "Number of workers that are expected, e.g. 3", ->(p) { opts[:workers] = p.to_i }]
   ]
 
   on startup do

data/server/routing/persist.rb

@@ -27,44 +27,43 @@ Daemonite.new do |opts|
     ["--url=URL", "-uURL", "Specify redis url", ->(p){ opts[:redis_url] = p }],
     ["--path=PATH", "-pPATH", "Specify redis path, e.g. /tmp/redis.sock", ->(p){ opts[:redis_path] = p }],
     ["--db=DB", "-dDB", "Specify redis db, e.g. 1", ->(p) { opts[:redis_db] = p.to_i }],
-    ["--worker=NUM", "-wNUM", "Specify the worker id, e.g. 0", ->(p) { opts[:worker] = p.to_i }]
+    ["--workers=NUM", "-wNUM", "Number of workers that are expected, e.g. 3", ->(p) { opts[:workers] = p.to_i }]
   ]
 
-  on setup do
-    opts[:worker] ||= 0
-    opts[:worker] = ('%02i' % opts[:worker]).freeze
-    opts[:pidfile] = File.basename(opts[:pidfile],'.pid') + '-' + opts[:worker].to_s + '.pid'
-  end
-
   on startup do
     opts[:redis_path] ||= '/tmp/redis.sock'.freeze
     opts[:redis_db] ||= 1
-    opts[:events] = [
-      'event:' + opts[:worker].to_s + ':state/change',
-      'event:' + opts[:worker].to_s + ':executionhandler/change',
-      'event:' + opts[:worker].to_s + ':description/change',
-      'event:' + opts[:worker].to_s + ':dataelements/change',
-      'event:' + opts[:worker].to_s + ':endpoints/change',
-      'event:' + opts[:worker].to_s + ':attributes/change',
-      'event:' + opts[:worker].to_s + ':transformation/change',
-      'event:' + opts[:worker].to_s + ':status/change',
-      'event:' + opts[:worker].to_s + ':position/change',
-      'event:' + opts[:worker].to_s + ':handler/change',
-      'callback:' + opts[:worker].to_s + ':activity/content'
-    ].freeze
+    opts[:events] = []
+    0.upto(opts[:workers]-1) do |w|
+      opts[:events] += [
+        'event:' + ('%02i' % w) + ':state/change',
+        'event:' + ('%02i' % w) + ':executionhandler/change',
+        'event:' + ('%02i' % w) + ':description/change',
+        'event:' + ('%02i' % w) + ':dataelements/change',
+        'event:' + ('%02i' % w) + ':endpoints/change',
+        'event:' + ('%02i' % w) + ':attributes/change',
+        'event:' + ('%02i' % w) + ':transformation/change',
+        'event:' + ('%02i' % w) + ':status/change',
+        'event:' + ('%02i' % w) + ':position/change',
+        'event:' + ('%02i' % w) + ':handler/change',
+        'callback:' + ('%02i' % w) + ':activity/content'
+      ]
+    end
+    opts[:events].freeze
     CPEE::redis_connect opts, 'Server Routing Persist'
     opts[:pubsubredis] = opts[:redis_dyn].call 'Server Routing Persist Sub'
+  rescue => e
+    puts e.message
+    puts e.backtrace
   end
 
   run do
-    p opts[:events]
     opts[:pubsubredis].subscribe(opts[:events]) do |on|
       on.message do |what, message|
-        p 'rrrr'
         mess = JSON.parse(message[message.index(' ')+1..-1])
         instance = mess.dig('instance')
         case what
-          when 'callback:' + opts[:worker] + ':activity/content'
+          when /callback:\d+:activity\/content/
             key = mess.dig('content','key')
             opts[:redis].multi do |multi|
               multi.sadd("instance:#{instance}/callbacks",key)
@@ -73,28 +72,28 @@ Daemonite.new do |opts|
               multi.set("instance:#{instance}/callback/#{key}/position",mess.dig('content','activity'))
               multi.set("instance:#{instance}/callback/#{key}/type",'callback')
             end
-          when 'event:' + opts[:worker] + ':state/change'
+          when /event:\d+:state\/change/
             opts[:redis].multi do |multi|
               unless mess.dig('content','state') == 'purged'
                 multi.set("instance:#{instance}/state",mess.dig('content','state'))
                 multi.set("instance:#{instance}/state/@changed",mess.dig('timestamp'))
               end
             end
-          when 'event:' + opts[:worker] + ':executionhandler/change'
+          when /event:\d+:executionhandler\/change/
             opts[:redis].set("instance:#{instance}/executionhandler",mess.dig('content','executionhandler'))
-          when 'event:' + opts[:worker] + ':description/change'
+          when /event:\d+:description\/change/
             opts[:redis].multi do |multi|
               multi.set("instance:#{instance}/description",mess.dig('content','description'))
               multi.set("instance:#{instance}/dslx",mess.dig('content','dslx'))
               multi.set("instance:#{instance}/dsl",mess.dig('content','dsl'))
             end
-          when 'event:' + opts[:worker] + ':dataelements/change', 'event:' + opts[:worker] + ':endpoints/change', 'event:' + opts[:worker] + ':attributes/change'
+          when /event:\d+:dataelements\/change/, /event:\d+:endpoints\/change/, /event:\d+:attributes\/change/
             topic = mess.dig('topic')
             opts[:redis].multi do |multi|
               mess.dig('content','changed')&.each_with_index do |c,i|
-                unless what == 'event:' + opts[:worker] + ':attributes/change' && c == 'uuid'
+                unless what =~ /event:\d+:attributes\/change/ && c == 'uuid'
                   multi.zadd("instance:#{instance}/#{topic}",i,c)
-                  if what == 'event:' + opts[:worker] + ':dataelements/change'
+                  if what =~ /event:\d+:dataelements\/change/
                     multi.set("instance:#{instance}/#{topic}/#{c}",CPEE::ValueHelper::generate(mess.dig('content','values',c)))
                   else
                     multi.set("instance:#{instance}/#{topic}/#{c}",mess.dig('content','values',c))
@@ -102,13 +101,13 @@ Daemonite.new do |opts|
                 end
               end
               mess.dig('content','deleted')&.to_a&.each do |c|
-                unless what == 'event:' + opts[:worker] + ':attributes/change' && c == 'uuid'
+                unless what =~ /event:\d+:attributes\/change/ && c == 'uuid'
                   multi.zrem("instance:#{instance}/#{topic}",c)
                   multi.del("instance:#{instance}/#{topic}/#{c}")
                 end
               end
             end
-          when 'event:' + opts[:worker] + ':transformation/change'
+          when /event:\d+:transformation\/change/
             opts[:redis].multi do |multi|
               multi.set("instance:#{instance}/transformation/description",mess.dig('content','description'))
               multi.set("instance:#{instance}/transformation/description/@type",mess.dig('content','description_type'))
@@ -117,12 +116,12 @@ Daemonite.new do |opts|
               multi.set("instance:#{instance}/transformation/endpoints",mess.dig('content','endpoints'))
               multi.set("instance:#{instance}/transformation/endpoints/@type",mess.dig('content','endpoints_type'))
             end
-          when 'event:' + opts[:worker] + ':status/change'
+          when /event:\d+:status\/change/
             opts[:redis].multi do |multi|
               multi.set("instance:#{instance}/status/id",mess.dig('content','id'))
               multi.set("instance:#{instance}/status/message",mess.dig('content','message'))
             end
-          when 'event:' + opts[:worker] + ':position/change'
+          when /event:\d+:position\/change/
             opts[:redis].multi do |multi|
               c = mess.dig('content')
               c.dig('unmark')&.each do |ele|
@@ -149,7 +148,7 @@ Daemonite.new do |opts|
                 multi.set("instance:#{instance}/positions/#{ele['position']}",'after')
               end
             end
-          when 'event:' + opts[:worker] + ':handler/change'
+          when /event:\d+:handler\/change/
             opts[:redis].multi do |multi|
               mess.dig('content','changed').each do |c|
                 multi.sadd("instance:#{instance}/handlers",mess.dig('content','key'))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cpee
 version: !ruby/object:Gem::Version
-  version: 2.1.41
+  version: 2.1.43
 platform: ruby
 authors:
 - Juergen eTM Mangler
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: tools
 cert_chain: []
-date: 2023-03-02 00:00:00.000000000 Z
+date: 2023-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riddl
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.114'
+        version: '0.126'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.114'
+        version: '0.126'
 - !ruby/object:Gem::Dependency
   name: weel
   requirement: !ruby/object:Gem::Requirement
@@ -66,14 +66,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
@@ -707,21 +707,9 @@ files:
 - server/resources/states.xml
 - server/resources/topics.xml
 - server/resources/transformation.xml
-- server/routing/end.pid
 - server/routing/end.rb
-- server/routing/forward-events-00.pid
-- server/routing/forward-events-01.pid
-- server/routing/forward-events-02.pid
-- server/routing/forward-events-03.pid
-- server/routing/forward-events-04.pid
 - server/routing/forward-events.rb
-- server/routing/forward-votes.pid
 - server/routing/forward-votes.rb
-- server/routing/persist-00.pid
-- server/routing/persist-01.pid
-- server/routing/persist-02.pid
-- server/routing/persist-03.pid
-- server/routing/persist-04.pid
 - server/routing/persist.rb
 - server/server.conf
 - server/server.pid

data/server/routing/end.pid

@@ -1 +0,0 @@
-1944554

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

@@ -1 +0,0 @@
-1944613

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

@@ -1 +0,0 @@
-1944633

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

@@ -1 +0,0 @@
-1944637

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

@@ -1 +0,0 @@
-1944645

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

@@ -1 +0,0 @@
-1944650

data/server/routing/forward-votes.pid

@@ -1 +0,0 @@
-1944558

data/server/routing/persist-00.pid

@@ -1 +0,0 @@
-1944562

data/server/routing/persist-01.pid

@@ -1 +0,0 @@
-1944566

data/server/routing/persist-02.pid

@@ -1 +0,0 @@
-1944570

data/server/routing/persist-03.pid

@@ -1 +0,0 @@
-1944598

data/server/routing/persist-04.pid

@@ -1 +0,0 @@
-1944602