cpee 2.1.39 → 2.1.41

data/server/routing/persist.rb

@@ -20,42 +20,51 @@ require 'daemonite'
 require_relative '../../lib/cpee/value_helper'
 require_relative '../../lib/cpee/redis'
 
-EVENTS = %w{
-  event:state/change
-  event:executionhandler/change
-  event:description/change
-  event:dataelements/change
-  event:endpoints/change
-  event:attributes/change
-  event:transformation/change
-  event:status/change
-  event:position/change
-  event:handler/change
-  callback:activity/content
-}
+EVENTS =
 
 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 }],
+    ["--worker=NUM", "-wNUM", "Specify the worker id, e.g. 0", ->(p) { opts[:worker] = 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'
+    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
     CPEE::redis_connect opts, 'Server Routing Persist'
     opts[:pubsubredis] = opts[:redis_dyn].call 'Server Routing Persist Sub'
   end
 
   run do
-    opts[:pubsubredis].subscribe(EVENTS) do |on|
+    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:activity/content'
+          when 'callback:' + opts[:worker] + ':activity/content'
             key = mess.dig('content','key')
             opts[:redis].multi do |multi|
               multi.sadd("instance:#{instance}/callbacks",key)
@@ -64,28 +73,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:state/change'
+          when 'event:' + opts[:worker] + ':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:executionhandler/change'
+          when 'event:' + opts[:worker] + ':executionhandler/change'
             opts[:redis].set("instance:#{instance}/executionhandler",mess.dig('content','executionhandler'))
-          when 'event:description/change'
+          when 'event:' + opts[:worker] + ':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:dataelements/change', 'event:endpoints/change', 'event:attributes/change'
+          when 'event:' + opts[:worker] + ':dataelements/change', 'event:' + opts[:worker] + ':endpoints/change', 'event:' + opts[:worker] + ':attributes/change'
             topic = mess.dig('topic')
             opts[:redis].multi do |multi|
               mess.dig('content','changed')&.each_with_index do |c,i|
-                unless what == 'event:attributes/change' && c == 'uuid'
+                unless what == 'event:' + opts[:worker] + ':attributes/change' && c == 'uuid'
                   multi.zadd("instance:#{instance}/#{topic}",i,c)
-                  if what == 'event:dataelements/change'
+                  if what == 'event:' + opts[:worker] + ':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))
@@ -93,13 +102,13 @@ Daemonite.new do |opts|
                 end
               end
               mess.dig('content','deleted')&.to_a&.each do |c|
-                unless what == 'event:attributes/change' && c == 'uuid'
+                unless what == 'event:' + opts[:worker] + ':attributes/change' && c == 'uuid'
                   multi.zrem("instance:#{instance}/#{topic}",c)
                   multi.del("instance:#{instance}/#{topic}/#{c}")
                 end
               end
             end
-          when 'event:transformation/change'
+          when 'event:' + opts[:worker] + ':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'))
@@ -108,12 +117,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:status/change'
+          when 'event:' + opts[:worker] + ':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:position/change'
+          when 'event:' + opts[:worker] + ':position/change'
             opts[:redis].multi do |multi|
               c = mess.dig('content')
               c.dig('unmark')&.each do |ele|
@@ -140,7 +149,7 @@ Daemonite.new do |opts|
                 multi.set("instance:#{instance}/positions/#{ele['position']}",'after')
               end
             end
-          when 'event:handler/change'
+          when 'event:' + opts[:worker] + ':handler/change'
             opts[:redis].multi do |multi|
               mess.dig('content','changed').each do |c|
                 multi.sadd("instance:#{instance}/handlers",mess.dig('content','key'))

data/server/server.conf

@@ -1,4 +1,4 @@
 :host:   tango.wst.univie.ac.at
 :port:   8298
-:url:    http://tango.wst.univie.ac.at/flow/engine/
+:url:    http://tango.wst.univie.ac.at:8298
 :secure: false

data/server/server.pid

@@ -0,0 +1 @@
+592827

data/tools/cpee

@@ -9,7 +9,7 @@ require 'xml/smart'
 require 'zip'
 require 'pp'
 
-def wrap(s, width=78, indent=18)
+def wrap(s, width=78, indent=23)
 	lines = []
 	line, s = s[0..indent-2], s[indent..-1]
   s.split(/\n/).each do |ss|
@@ -29,32 +29,34 @@ end
 
 ARGV.options { |opt|
   opt.summary_indent = ' ' * 2
-  opt.summary_width = 15
-  opt.banner = "Usage:\n#{opt.summary_indent}#{File.basename($0)} [options] convert | ui | cpui DIR | new DIR | archive DIR URL | start URL | delete! URL | abandon URL\n"
+  opt.summary_width = 20
+  opt.banner = "Usage:\n#{opt.summary_indent}#{File.basename($0)} [options] convert | ui | cpui DIR | new DIR | archive DIR URL | start URL | delete! URL | abandon URL | a_by_name URL STRING\n"
   opt.on("Options:")
   opt.on("--help", "-h", "This text") { puts opt; exit }
 	opt.on("")
-  opt.on(wrap("[archive DIR URL] save properties from all finished instances listed at URL into DIR. Examples:\ncpee archive ./archive http://localhost:9298/1/\ncpee archive ./archive http://localhost:9298/1-200\ncpee archive ./archive http://localhost:9298/*"))
+  opt.on(wrap("[archive DIR URL]      save properties from all finished instances listed at URL into DIR. Examples:\ncpee archive ./archive http://localhost:9298/1/\ncpee archive ./archive http://localhost:9298/1-200\ncpee archive ./archive http://localhost:9298/*"))
 	opt.on("")
-  opt.on(wrap("[abandon URL]     running processes are stopped; ready or stopped processes are abandoned. Examples:\ncpee abandon http://localhost:9298/1/\ncpee abandon http://localhost:9298/1-200\ncpee abandon http://localhost:9298/*"))
+  opt.on(wrap("[abandon URL]          running processes are stopped; ready or stopped processes are abandoned. Examples:\ncpee abandon http://localhost:9298/1/\ncpee abandon http://localhost:9298/1-200\ncpee abandon http://localhost:9298/*"))
 	opt.on("")
-  opt.on(wrap("[start URL]       stopped processes are started; all others are not touched. Examples:\ncpee start http://localhost:9298/1\ncpee start http://localhost:9298/1-200\ncpee start http://localhost:9298/*"))
+  opt.on(wrap("[a_by_name URL STRING] ready or stopped processes are abandoned by regex on attributes/info. Examples:\ncpee abandon http://localhost:9298/1/ \"aa.a\"\ncpee abandon http://localhost:9298/1-200 aaa"))
 	opt.on("")
-  opt.on(wrap("[delete! URL]     DANGER ZONE. Vanishes forever. Not in archive. Examples:\ncpee delete! http://localhost:9298/1/"))
+  opt.on(wrap("[start URL]            stopped processes are started; all others are not touched. Examples:\ncpee start http://localhost:9298/1\ncpee start http://localhost:9298/1-200\ncpee start http://localhost:9298/*"))
 	opt.on("")
-  opt.on(wrap("[new DIR]         scaffolds a sample execution engine. Everything except instances can be removed for default behaviour."))
+  opt.on(wrap("[delete! URL]          DANGER ZONE. Vanishes forever. Not in archive. Examples:\ncpee delete! http://localhost:9298/1/"))
 	opt.on("")
-  opt.on(wrap("[cpui DIR]        scaffolds a sample html client. New versions might require manual merging if you changed something."))
+  opt.on(wrap("[new DIR]              scaffolds a sample execution engine. Everything except instances can be removed for default behaviour."))
 	opt.on("")
-  opt.on(wrap("[ui]              starts a simple static web server with the ui on http://localhost:8080. Use [cpui DIR] if you want stuff in apache or nginx."))
+  opt.on(wrap("[cpui DIR]             scaffolds a sample html client. New versions might require manual merging if you changed something."))
 	opt.on("")
-  opt.on(wrap("[convert]         converts all testsets in the current directory to cpee2"))
+  opt.on(wrap("[ui]                   starts a simple static web server with the ui on http://localhost:8080. Use [cpui DIR] if you want stuff in apache or nginx."))
+	opt.on("")
+  opt.on(wrap("[convert]              converts all testsets in the current directory to the newest format"))
   opt.parse!
 }
 if (ARGV.length == 0) ||
    (ARGV.length == 1  && !(%w(ui convert).include?(ARGV[0]))) ||
    (ARGV.length == 2  && !(%w(abandon start delete! cpui new).include?(ARGV[0]))) ||
-   (ARGV.length == 3  && ARGV[0] != 'archive') ||
+   (ARGV.length == 3  && !(%w(archive a_by_name).include?(ARGV[0]))) ||
    (ARGV.length >  3)
   puts ARGV.options
   exit
@@ -210,6 +212,44 @@ elsif command == 'archive'
     end
   end
   puts
+elsif command == 'a_by_name'
+  p1 = File.join(p1,'*') if p1 =~ /([a-zA-Z]|\/)$/
+  base = File.dirname(p1)
+  names = []
+  if File.basename(p1) =~ /(\d+)-(\d+)/
+    names = ($1.to_i..$2.to_i).to_a
+  elsif File.basename(p1) == '*'
+    res = Typhoeus.get(File.join(base,'/'), headers: { 'see-instances' => 'true' })
+    if res.success?
+      XML::Smart.string(res.response_body) do |doc|
+        doc.find('//instance/@id').each do |ele|
+          names << ele.value
+        end
+      end
+      names.reverse!
+    else
+      exit
+    end
+  else
+    names << File.basename(p1)
+  end
+  names.each do |name|
+    print "Working on: " + name.to_s + "\r"
+    res1 = Typhoeus.get(File.join(base,name.to_s,'properties','state','/'))
+    res2 = Typhoeus.get(File.join(base,name.to_s,'properties','attributes','info','/'))
+    if res1.success?
+      if res1.response_body == 'stopping'
+        if res2.success? && res2.response_body =~ /#{p2}/
+          Typhoeus.put(File.join(base,name.to_s,'properties','state','/'), headers: {'Content-Type' => 'application/x-www-form-urlencoded'}, body: "value=stopping")
+        end
+      elsif res1.response_body == 'ready' || res1.response_body == 'stopped'
+        if res2.success? && res2.response_body =~ /#{p2}/
+          Typhoeus.put(File.join(base,name.to_s,'properties','state','/'), headers: {'Content-Type' => 'application/x-www-form-urlencoded'}, body: "value=abandoned")
+        end
+      end
+    end
+  end
+  puts
 elsif command == 'abandon'
   p1 = File.join(p1,'*') if p1 =~ /([a-zA-Z]|\/)$/
   base = File.dirname(p1)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cpee
 version: !ruby/object:Gem::Version
-  version: 2.1.39
+  version: 2.1.41
 platform: ruby
 authors:
 - Juergen eTM Mangler
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: tools
 cert_chain: []
-date: 2022-12-08 00:00:00.000000000 Z
+date: 2023-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riddl
@@ -169,6 +169,7 @@ files:
 - cockpit/contrib/transformation1.xsl
 - cockpit/contrib/transformation2.xsl
 - cockpit/contrib/tree_example.svg
+- cockpit/css/graph.css
 - cockpit/css/model.css
 - cockpit/css/replay.css
 - cockpit/css/track.css
@@ -187,6 +188,7 @@ files:
 - cockpit/js/track.js
 - cockpit/js/ui.js
 - cockpit/js/wfadaptor.js
+- cockpit/js_libs.zip
 - cockpit/model.html
 - cockpit/replay.html
 - cockpit/rngs/attributes.rng
@@ -309,6 +311,7 @@ files:
 - cockpit/themes/compact/symbols/start_event.svg
 - cockpit/themes/compact/symbols/stop.svg
 - cockpit/themes/compact/symbols/terminate.svg
+- cockpit/themes/compact/symbols/test.svg
 - cockpit/themes/compact/theme.js
 - cockpit/themes/control/rngs/alternative.rng
 - cockpit/themes/control/rngs/call.rng
@@ -363,6 +366,7 @@ files:
 - cockpit/themes/control/symbols/start_event.svg
 - cockpit/themes/control/symbols/stop.svg
 - cockpit/themes/control/symbols/terminate.svg
+- cockpit/themes/control/symbols/test.svg
 - cockpit/themes/control/theme.js
 - cockpit/themes/default/rngs/alternative.rng
 - cockpit/themes/default/rngs/call.rng
@@ -417,6 +421,7 @@ files:
 - cockpit/themes/default/symbols/start_event.svg
 - cockpit/themes/default/symbols/stop.svg
 - cockpit/themes/default/symbols/terminate.svg
+- cockpit/themes/default/symbols/test.svg
 - cockpit/themes/default/theme.js
 - cockpit/themes/extended/rngs/alternative.rng
 - cockpit/themes/extended/rngs/call.rng
@@ -471,6 +476,7 @@ files:
 - cockpit/themes/extended/symbols/start_event.svg
 - cockpit/themes/extended/symbols/stop.svg
 - cockpit/themes/extended/symbols/terminate.svg
+- cockpit/themes/extended/symbols/test.svg
 - cockpit/themes/extended/theme.js
 - cockpit/themes/model/rngs/alternative.rng
 - cockpit/themes/model/rngs/call.rng
@@ -520,6 +526,7 @@ files:
 - cockpit/themes/model/symbols/start_event.svg
 - cockpit/themes/model/symbols/stop.svg
 - cockpit/themes/model/symbols/terminate.svg
+- cockpit/themes/model/symbols/test.svg
 - cockpit/themes/model/theme.js
 - cockpit/themes/packed/rngs/alternative.rng
 - cockpit/themes/packed/rngs/call.rng
@@ -574,6 +581,7 @@ files:
 - cockpit/themes/packed/symbols/start_event.svg
 - cockpit/themes/packed/symbols/stop.svg
 - cockpit/themes/packed/symbols/terminate.svg
+- cockpit/themes/packed/symbols/test.svg
 - cockpit/themes/packed/theme.js
 - cockpit/themes/preset/rngs/alternative.rng
 - cockpit/themes/preset/rngs/call.rng
@@ -628,6 +636,7 @@ files:
 - cockpit/themes/preset/symbols/start_event.svg
 - cockpit/themes/preset/symbols/stop.svg
 - cockpit/themes/preset/symbols/terminate.svg
+- cockpit/themes/preset/symbols/test.svg
 - cockpit/themes/preset/theme.js
 - cockpit/track.html
 - cockpit/transformations.xml
@@ -690,7 +699,6 @@ files:
 - server/executionhandlers/ruby/controller.rb
 - server/executionhandlers/ruby/dsl_to_dslx.xsl
 - server/executionhandlers/ruby/execution.rb
-- server/executionhandlers/ruby/test.xml
 - server/resources/empty_dslx.xml
 - server/resources/notifications/logging/subscription.xml
 - server/resources/properties.empty
@@ -701,13 +709,22 @@ files:
 - server/resources/transformation.xml
 - server/routing/end.pid
 - server/routing/end.rb
-- server/routing/forward-events.pid
+- 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.pid
+- 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
 - server/server.rb
 - tools/cpee
 - tools/server/cpee
@@ -732,7 +749,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.3.26
 signing_key:
 specification_version: 4
 summary: Preliminary release of cloud process execution engine (cpee.org). If you

data/server/executionhandlers/ruby/test.xml

@@ -1,43 +0,0 @@
-<?xml version="1.0"?>
-<description xmlns="http://cpee.org/ns/description/1.0">
-  <call id="a1" endpoint="">
-    <parameters>
-      <label>asdad</label>
-      <method>:post</method>
-      <arguments/>
-    </parameters>
-    <code>
-      <prepare/>
-      <finalize output="result"/>
-      <update output="result"/>
-      <rescue output="result"/>
-    </code>
-    <annotations>
-      <_timing>
-        <_timing_weight/>
-        <_timing_avg/>
-        <explanations/>
-      </_timing>
-      <_context_data_analysis>
-        <probes/>
-        <ips/>
-      </_context_data_analysis>
-      <report>
-        <url>http://hoellerersdsdf</url>
-      </report>
-      <_notes>
-        <_notes_general/>
-      </_notes>
-    </annotations>
-    <documentation>
-      <input/>
-      <output/>
-      <implementation>
-        <description/>
-      </implementation>
-      <code>
-        <description/>
-      </code>
-    </documentation>
-  </call>
-</description>

data/server/routing/forward-events.pid

@@ -1 +0,0 @@
-931760

data/server/routing/persist.pid

@@ -1 +0,0 @@
-931768