cpee 2.1.101 → 2.1.102

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 269c5121fd56cc7234ff74bc1f84ea6705f11d6eeb36afabcdf1951e07e5c88a
-  data.tar.gz: 6f12152051c5c42f8fa2695cd8087e0e030d4dec1c3cbdb5fc0ec60de75c13f6
+  metadata.gz: 5010919e54c7d79b545e7014b32b2fa8c9a57ae1d99cbb478027c93ef9a944c7
+  data.tar.gz: 556acc355be78bfdf3b51c2ef171795ca92dc8abf14569eb736cc208bc624677
 SHA512:
-  metadata.gz: 35c90c419f756d9db88ef19ad4491200e84bbd30c9f1db57564ede45b869ad9d71725a35239889adbc5fff9aeeaaa6c0a20a5980bc3636dee3e051847154439d
-  data.tar.gz: 7988040107a41c2c98c1fe4bb997ce3076bc2e3d33f270633512259ac3aee513ea769eea7322e7eacbf6a4b90b741b29d70ef930dd007fd09b74fe568634b04a
+  metadata.gz: eb2d4c8d1c20971179ef9c07883c3bb8669993588677d4c61720514c82f6d3644d58517a5d85821f1cd52f0621b5cc9643727b0369f7d8a85d6202cfa0576fd8
+  data.tar.gz: 33515554a3c69f90ddca7b479583258cf2a6ecd41b149dddcddfcc14e9abc371613770edf117b0a699765beb5b4c90f9a58216c1339036c3d90db73295b65bbd

data/cpee.gemspec

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

data/lib/cpee/implementation.rb

@@ -75,13 +75,16 @@ module CPEE
     opts[:dashing_frequency]          ||= 3
     opts[:dashing_target]             ||= nil
 
-    ### set redis_cmd to nil if you want to do global
-    ### at least redis_path or redis_url and redis_db have to be set if you do global
-    opts[:redis_path]                 ||= 'redis.sock' # use e.g. /tmp/redis.sock for global stuff. Look it up in your redis config
-    opts[:redis_port]                 ||= 0
-    opts[:redis_db]                   ||= 0
     ### optional redis stuff
-    opts[:redis_url]                  ||= nil
+    ### port is parsed from redis url
+    ### when redis can not be connected, it is started, user, pass and port are extracted
+    ### opts[:redis_url]              ||= unix://redis.sock
+    ### opts[:redis_url]              ||= redis-socket://redis.sock
+    ### opts[:redis_url]              ||= redis-socket:///tmp/redis.sock
+    ### opts[:redis_url]              ||= redis://echo.bpm.in.tum.de:8798
+    ### opts[:redis_url]              ||= redis://localhost:8798
+    opts[:redis_db]                   ||= 0
+    opts[:redis_url]                  ||= 'unix://redis.sock' # sadly we have to do this for now
     opts[:redis_unixsocket]           ||= true
     opts[:redis_cmd]                  ||= 'redis-server --port #redis_port# --unixsocket #redis_path# --unixsocketperm 600 --pidfile #redis_pid# --dir #redis_db_dir# --dbfilename #redis_db_name# --databases 1 --save 900 1 --save 300 10 --save 60 10000 --rdbcompression yes --daemonize yes --protected-mode no'
     opts[:redis_pid]                  ||= 'redis.pid' # use e.g. /var/run/redis.pid if you do global. Look it up in your redis config
@@ -125,9 +128,9 @@ module CPEE
       CPEE::Message::set_workers(opts[:workers])
 
       parallel do
-        CPEE::watch_services(opts[:watchdog_start_off],opts[:redis_url],File.join(opts[:basepath],opts[:redis_path]),opts[:redis_db],opts[:workers],opts[:workers_single],opts[:workers_multi])
+        CPEE::watch_services(opts[:watchdog_start_off],opts[:redis_url],opts[:redis_db],opts[:workers],opts[:workers_single],opts[:workers_multi])
         EM.add_periodic_timer(opts[:watchdog_frequency]) do ### start services
-          CPEE::watch_services(opts[:watchdog_start_off],opts[:redis_url],File.join(opts[:basepath],opts[:redis_path]),opts[:redis_db],opts[:workers],opts[:workers_single],opts[:workers_multi])
+          CPEE::watch_services(opts[:watchdog_start_off],opts[:redis_url],opts[:redis_db],opts[:workers],opts[:workers_single],opts[:workers_multi])
         end
         EM.defer do ### catch all sse connections
           CPEE::Notifications::sse_distributor(opts)
@@ -220,7 +223,7 @@ module CPEE
     end
   end
 
-  def self::watch_services(watchdog_start_off,url,path,db,workers,workers_single,workers_multi)
+  def self::watch_services(watchdog_start_off,url,db,workers,workers_single,workers_multi)
     return if watchdog_start_off
     EM.defer do
       workers_single.each do |s|
@@ -228,11 +231,7 @@ 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))
-          cmd = if url.nil?
-            "-p \"#{path}\" -d #{db} -w #{workers} restart 1>/dev/null 2>&1"
-          else
-            "-u \"#{url}\" -d #{db} -w #{workers} restart 1>/dev/null 2>&1"
-          end
+          cmd = "-u \"#{url}\" -d #{db} -w #{workers} restart 1>/dev/null 2>&1"
           system "#{s}.rb " + cmd + " 1>/dev/null 2>&1"
           puts "➡ Service #{File.basename(s)} (#{cmd}) started ..."
         end

data/lib/cpee/redis.rb

@@ -13,18 +13,13 @@
 # <http://www.gnu.org/licenses/>.
 
 require 'redis'
+require 'uri'
 
 module CPEE
   def self::redis_connect(opts,name=nil)
     if opts[:redis_cmd].nil?
       begin
-        if opts[:redis_path]
-          opts[:redis_dyn] = Proc.new { |name| Redis.new(path: opts[:redis_path], db: opts[:redis_db], id: name.gsub(/[^a-zA-Z0-9]/,'-') ) }
-        elsif opts[:redis_url]
-          opts[:redis_dyn] = Proc.new { |name| Redis.new(url: opts[:redis_url], db: opts[:redis_db], id: name.gsub(/[^a-zA-Z0-9]/,'-') ) }
-        else
-          raise
-        end
+        opts[:redis_dyn] = Proc.new { |name| Redis.new(url: opts[:redis_url], db: opts[:redis_db], id: name.gsub(/[^a-zA-Z0-9]/,'-') ) }
         opts[:redis] = opts[:redis_dyn].call name.gsub(/[^a-zA-Z0-9]/,'-')
         opts[:redis].dbsize
       rescue
@@ -32,19 +27,31 @@ module CPEE
         exit
       end
     else # we always assume file socket if redis is startet locally
-      opts[:redis_dyn] = if opts[:redis_path]
-        Proc.new { |name| Redis.new(path: File.join(opts[:basepath],opts[:redis_path]), db: opts[:redis_db].to_i, id: name.gsub(/[^a-zA-Z0-9]/,'-') ) }
-      elsif opts[:redis_url]
-        Proc.new { |name| Redis.new(url: opts[:redis_url], db: opts[:redis_db], id: name.gsub(/[^a-zA-Z0-9]/,'-') ) }
+      uri = URI::parse(opts[:redis_url])
+      if uri.scheme == 'unix' || uri.scheme == 'redis-socket'
+        opts[:redis_path] = File.join(uri.host,uri.path).sub(/\/$/,'')
+        if !File.absolute_path? opts[:redis_path]
+          opts[:redis_url] = 'unix://' + File.join(opts[:basepath],opts[:redis_path])
+        end
+        opts[:redis_port] = 0
+        opts[:redis_unixsocket] = true
       else
-        raise
+        opts[:redis_port] = uri.port
+        opts[:redis_path] = nil
+        opts[:redis_unixsocket] = false
       end
 
+      opts[:redis_dyn] = Proc.new { |name| Redis.new(url: opts[:redis_url], db: opts[:redis_db], id: name.gsub(/[^a-zA-Z0-9]/,'-') ) }
+
       tried = false
       begin
         opts[:redis] = opts[:redis_dyn].call name.gsub(/[^a-zA-Z0-9]/,'-')
         opts[:redis].dbsize
       rescue => e
+        puts e.message
+        puts e.backtrace
+        exit
+
         res = unless tried
           rcmd = opts[:redis_cmd]
           if opts[:redis_path]
@@ -52,11 +59,22 @@ module CPEE
           else
             rcmd.gsub! /#redis_path#\s+/, ''
           end
-          rcmd.gsub! /#redis_db_dir#/, opts[:basepath]
+          if File.absolute_path? opts[:redis_db_name]
+            rcmd.gsub! /#redis_db_dir#/, File.dirname(opts[:redis_db_name])
+          else
+            rcmd.gsub! /#redis_db_dir#/, opts[:basepath]
+          end
           rcmd.gsub! /#redis_db_name#/, opts[:redis_db_name]
-          rcmd.gsub! /#redis_pid#/, File.join(opts[:basepath],opts[:redis_pid])
+          if File.absolute_path? opts[:redis_pid]
+            rcmd.gsub! /#redis_pid#/, opts[:redis_pid]
+          else
+            rcmd.gsub! /#redis_pid#/, File.join(opts[:basepath],opts[:redis_pid])
+          end
           rcmd.gsub! /#redis_port#/, opts[:redis_port].to_s
-          rcmd.gsub! /--unixsocket\s+/, '' if opts[:redis_unixsocket] == false
+          if opts[:redis_unixsocket] == false
+            rcmd.gsub! /--unixsocket\s+/, ''
+            rcmd.gsub! /--unixsocketperm\s+\d+\s+/, ''
+          end
           puts 'starting redis ... it will keep running, just to let you know ...'
           system rcmd
         else

data/server/executionhandlers/eval/backend/opts.yaml

@@ -1,6 +1,5 @@
 :host: localhost
 :url: http://localhost:8298/
-:redis_path: /tmp/redis.sock
-:redis_db: 3
+:redis_db: 1
 :executionhandlers: ../../executionhandlers/
 :executionhandler: eval

data/server/executionhandlers/eval/execution.rb

@@ -35,6 +35,7 @@ module CPEE
         hw = CPEE::Persistence::extract_item(id,opts,'executionhandler')
         endpoints = CPEE::Persistence::extract_list(id,opts,'endpoints')
         dataelements = CPEE::Persistence::extract_list(id,opts,'dataelements')
+        attributes = CPEE::Persistence::extract_list(id,opts,'attributes')
         positions = CPEE::Persistence::extract_set(id,opts,'positions')
         positions.map! do |k, v|
           [ k, v, CPEE::Persistence::extract_item(id,opts,File.join('positions',k,'@passthrough')) ]
@@ -43,7 +44,6 @@ module CPEE
         iopts[:host] = opts[:host]
         iopts[:url] = opts[:url]
         iopts[:redis_url] = opts[:redis_url]
-        iopts[:redis_path] = File.join(opts[:basepath],opts[:redis_path])
         iopts[:redis_db] = opts[:redis_db]
         iopts[:workers] = opts[:workers]
         iopts[:global_executionhandlers] = opts[:global_executionhandlers]

data/server/executionhandlers/ruby/backend/opts.yaml

@@ -1,7 +1,6 @@
 :host: localhost
 :url: http://localhost:8298/
-:redis_path: /tmp/redis.sock
-:redis_db: 3
+:redis_db: 1
 :executionhandlers: ../../executionhandlers/
 :executionhandler: ruby
 :url_result_transformation: http://localhost:9302/structurize

data/server/executionhandlers/ruby/execution.rb

@@ -35,6 +35,7 @@ module CPEE
         hw = CPEE::Persistence::extract_item(id,opts,'executionhandler')
         endpoints = CPEE::Persistence::extract_list(id,opts,'endpoints')
         dataelements = CPEE::Persistence::extract_list(id,opts,'dataelements')
+        attributes = CPEE::Persistence::extract_list(id,opts,'attributes')
         positions = CPEE::Persistence::extract_set(id,opts,'positions')
         positions.map! do |k, v|
           [ k, v, CPEE::Persistence::extract_item(id,opts,File.join('positions',k,'@passthrough')) ]
@@ -43,7 +44,6 @@ module CPEE
         iopts[:host] = opts[:host]
         iopts[:url] = opts[:url]
         iopts[:redis_url] = opts[:redis_url]
-        iopts[:redis_path] = File.join(opts[:basepath],opts[:redis_path])
         iopts[:redis_db] = opts[:redis_db]
         iopts[:workers] = opts[:workers]
         iopts[:global_executionhandlers] = opts[:global_executionhandlers]
@@ -56,13 +56,23 @@ module CPEE
         template = ERB.new(File.read(ExecutionHandler::Ruby::BACKEND_TEMPLATE), trim_mode: '-')
         res = template.result_with_hash(dsl: dsl, dataelements: dataelements, endpoints: endpoints, positions: positions)
         File.write(File.join(opts[:instances],id.to_s,ExecutionHandler::Ruby::BACKEND_INSTANCE),res)
+        # if attributes['remote']
+        #   ### scp instance files to the remote server under run (under instance id)
+        #   ### touch local .remote with connection details
+        # end
       end
 
       def self::run(id,opts)
-        exe = File.join(opts[:instances],id.to_s,File.basename(ExecutionHandler::Ruby::BACKEND_RUN))
-        pid = Kernel.spawn(opts[:libs_preloaderrun] + ' ' + exe , :pgroup => true, :in => '/dev/null', :out => exe + '.out', :err => exe + '.err')
-        Process.detach pid
-        File.write(exe + '.pid',pid)
+        ### if File file .remote
+          ### connect to remote
+          ### run same as below
+        ### else
+          ### Determine whether we run locally or remote
+          exe = File.join(opts[:instances],id.to_s,File.basename(ExecutionHandler::Ruby::BACKEND_RUN))
+          pid = Kernel.spawn(opts[:libs_preloaderrun] + ' ' + exe , :pgroup => true, :in => '/dev/null', :out => exe + '.out', :err => exe + '.err')
+          Process.detach pid
+          File.write(exe + '.pid',pid)
+        ### end
       end
 
       def self::stop(id,opts) ### return: bool to tell if manually changing redis is necessary

data/server/routing/end.pid

@@ -1 +1 @@
-3817762
+377213

data/server/routing/end.rb

@@ -22,13 +22,11 @@ require_relative '../../lib/cpee/redis'
 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 }],
     ["--workers=NUM", "-wNUM", "Number of workers that are expected, e.g. 3", ->(p) { opts[:workers] = p.to_i }]
   ]
 
   on startup do
-    opts[:redis_path] ||= '/tmp/redis.sock' if opts[:redis_url].nil?
     opts[:redis_db] ||= 1 if opts[:redis_db].nil?
 
     CPEE::redis_connect opts, 'Server Routing End'

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

@@ -1 +1 @@
-3817526
+377231

data/server/routing/forward-events.rb

@@ -22,7 +22,6 @@ require_relative '../../lib/cpee/redis'
 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 }],
     ["--worker=NUM", "-wNUM", "Specify the worker id, e.g. 0", ->(p) { opts[:worker] = p.to_i }]
   ]
@@ -34,7 +33,6 @@ Daemonite.new do |opts|
   end
 
   on startup do
-    opts[:redis_path] ||= '/tmp/redis.sock' if opts[:redis_url].nil?
     opts[:redis_db] ||= 1 if opts[:redis_db].nil?
     CPEE::redis_connect opts, 'Server Routing Forward Events'
     opts[:pubsubredis] = opts[:redis_dyn].call 'Server Routing Forward Events Sub'

data/server/routing/forward-votes.pid

@@ -1 +1 @@
-3817682
+377225

data/server/routing/forward-votes.rb

@@ -49,13 +49,11 @@ end #}}}
 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 }],
     ["--workers=NUM", "-wNUM", "Number of workers that are expected, e.g. 3", ->(p) { opts[:workers] = p.to_i }]
   ]
 
   on startup do
-    opts[:redis_path] ||= '/tmp/redis.sock' if opts[:redis_url].nil?
     opts[:redis_db] ||= 1 if opts[:redis_db].nil?
 
     CPEE::redis_connect opts, 'Server Routing Forward Votes'

data/server/routing/persist.pid

@@ -1 +1 @@
-3817733
+377219

data/server/routing/persist.rb

@@ -25,13 +25,11 @@ 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 }],
     ["--workers=NUM", "-wNUM", "Number of workers that are expected, e.g. 3", ->(p) { opts[:workers] = p.to_i }]
   ]
 
   on startup do
-    opts[:redis_path] ||= '/tmp/redis.sock' if opts[:redis_url].nil?
     opts[:redis_db] ||= 1 if opts[:redis_db].nil?
     opts[:events] = []
     0.upto(opts[:workers]-1) do |w|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cpee
 version: !ruby/object:Gem::Version
-  version: 2.1.101
+  version: 2.1.102
 platform: ruby
 authors:
 - Juergen eTM Mangler
@@ -1054,12 +1054,6 @@ files:
 - 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-05.pid
-- server/routing/forward-events-06.pid
 - server/routing/forward-events.rb
 - server/routing/forward-votes.pid
 - server/routing/forward-votes.rb

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

@@ -1 +0,0 @@
-3817540

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

@@ -1 +0,0 @@
-3817554

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

@@ -1 +0,0 @@
-3817568

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

@@ -1 +0,0 @@
-3817582

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

@@ -1 +0,0 @@
-3817596

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

@@ -1 +0,0 @@
-3817610