cpee 2.1.104 → 2.1.106

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8f641a0e013ea34d5fcde9985698e424b88fc1083da2fa409a7ff49961e6ee7d
-  data.tar.gz: 49b128e338257b1929c5bf7898479702542ee2612fc25aa447692480a1a72796
+  metadata.gz: 120f815f0f7416213d0187df51838246bfadbdbbc837e5d4d838bf906fc5fc6d
+  data.tar.gz: 675707c9d0963d88092549224c4701d11ca857921915c732267126595198062b
 SHA512:
-  metadata.gz: 26e968160d080857bf4931dec48692c9dc049ee5c30eb72a9c555cc7eaae7cd9d72cb84a50284a75fcdb028dfe4b5634d1d7c5214a08d880b0ef31a47bf2a20a
-  data.tar.gz: dc955cbfec7ac4d81a6528dd31c15eced6c07d34044551a8bcd3f0e8cce4e6289aaefd11928b7011e55789f06b9705aca8248f03c005179a0a43120c98805aa7
+  metadata.gz: 307601239e89aff52adbafbecd178ae742adf8b503e19f895b598152b28992b7300f3489afc87a2f91cc2f776320555759a761f3707ad125ae33091eb9dce1bc
+  data.tar.gz: 53659f21aa9416ad069b43efb1519b6b9cbcd6ee4da0305a53b282ce63e96e14b150bbad40f6b32d763d84c6665f41461c1d3bf8c34e643afaf558a54f564621

data/cpee.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee"
-  s.version          = "2.1.104"
+  s.version          = "2.1.106"
   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/server/executionhandlers/eval/backend/run.rb

@@ -1,22 +1,18 @@
+require 'cpee/constants'
 require 'yaml'
 opts = YAML::load_file(File.join(__dir__,'opts.yaml'))
 opts[:pidf] = __FILE__ + '.pid'
 opts[:pid] = Process.pid
 
-global_controller = File.join(opts[:global_executionhandlers],opts[:executionhandler],'controller.rb')
-controller        = File.join(opts[:executionhandlers],       opts[:executionhandler],'controller.rb')
-if File.exist? global_controller
-  require global_controller
-elsif File.exist? controller
-  require controller
-end
-
-global_connectionhandler = File.join(opts[:global_executionhandlers],opts[:executionhandler],'connection.rb')
-connectionhandler        = File.join(opts[:executionhandlers],       opts[:executionhandler],'connection.rb')
-if File.exist? global_connectionhandler
-  require global_connectionhandler
-elsif File.exist? connectionhandler
-  require connectionhandler
+opts[:global_executionhandlers] = CPEE::GLOBAL_EXECUTIONHANDLERS unless opts[:global_executionhandlers]
+['controller.rb','connection.rb'].each do |f|
+  global_thing = File.join(opts[:global_executionhandlers],opts[:executionhandler],f)
+  thing        = File.join(opts[:executionhandlers],       opts[:executionhandler],f)
+  if File.exist? global_thing
+    require global_thing
+  elsif File.exist? thing
+    require thing
+  end
 end
 
 require_relative 'instance'

data/server/executionhandlers/eval/execution.rb

@@ -35,7 +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')
+        attributes = CPEE::Persistence::extract_list(id,opts,'attributes').to_h
         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')) ]
@@ -46,9 +46,14 @@ module CPEE
         iopts[:redis_url] = opts[:redis_url]
         iopts[:redis_db] = opts[:redis_db]
         iopts[:workers] = opts[:workers]
-        iopts[:global_executionhandlers] = opts[:global_executionhandlers]
-        iopts[:executionhandlers] = opts[:executionhandlers]
         iopts[:executionhandler] = hw
+        if attributes.has_key?('remote')
+          uri = URI::parse(attributes['remote'])
+          iopts[:executionhandlers] = File.join(uri.path,File.basename(opts[:executionhandlers]))
+        else
+          iopts[:executionhandlers] = opts[:executionhandlers]
+          iopts[:global_executionhandlers] = opts[:global_executionhandlers]
+        end
 
         File.open(File.join(opts[:instances],id.to_s,File.basename(ExecutionHandler::Eval::BACKEND_OPTS)),'w') do |f|
           YAML::dump(iopts,f)
@@ -56,24 +61,55 @@ module CPEE
         template = ERB.new(File.read(ExecutionHandler::Eval::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::Eval::BACKEND_INSTANCE),res)
+        if attributes.has_key?('remote')
+          uri = URI::parse(attributes['remote'])
+          Net::SSH.start(uri.host,uri.user,:keys => [ opts[:ssh_key] ] ) do |ssh|
+            ssh.exec!("rm -rf #{File.join(uri.path,id.to_s,'*')}")
+            ssh.scp.upload!(File.join(opts[:instances],id.to_s),uri.path,:recursive=>true)
+          end
+          File.write(File.join(opts[:instances],id.to_s,'.remote'),attributes['remote'])
+        end
       end
 
       def self::run(id,opts)
-        exe = File.join(opts[:instances],id.to_s,File.basename(ExecutionHandler::Eval::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.exist? File.join(opts[:instances],id.to_s,'.remote')
+          uri = URI::parse(File.read(File.join(opts[:instances],id.to_s,'.remote')))
+          exe = File.join(uri.path,id.to_s,File.basename(BACKEND_RUN))
+          Net::SSH.start(uri.host,uri.user,:keys => [ opts[:ssh_key] ] ) do |ssh|
+            ssh.exec!("ruby #{exe} >#{exe}.out 2>#{exe}.err &")
+          end
+        else
+          exe = File.join(opts[:instances],id.to_s,File.basename(ExecutionHandler::Eval::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
-        exe = File.join(opts[:instances],id.to_s,File.basename(ExecutionHandler::Eval::BACKEND_RUN))
-        pid = File.read(exe + '.pid') rescue nil
-        if pid && (Process.kill(0, pid.to_i) rescue false)
-          Process.kill('HUP', pid.to_i) rescue nil
-          false
-        else # its not running, so clean up
-          File.unlink(exe + '.pid') rescue nil
-          true
+        if File.exist? File.join(opts[:instances],id.to_s,'.remote')
+          uri = URI::parse(File.read(File.join(opts[:instances],id.to_s,'.remote')))
+          exe = File.join(uri.path,id.to_s,File.basename(BACKEND_RUN))
+          Net::SSH.start(uri.host,uri.user,:keys => [ opts[:ssh_key] ] ) do |ssh|
+            pid = ssh.exec!("cat #{exe}.pid 2>/dev/null")
+            if pid != '' && ssh.exec!("kill -0 #{pid} >/dev/null 2>&1; echo $?").strip == '0'
+              ssh.exec!("kill -SIGHUP #{pid}")
+              false
+            else
+              ssh.exec!("rm #{exe}.pid")
+              true
+            end
+          end
+        else
+          exe = File.join(opts[:instances],id.to_s,File.basename(ExecutionHandler::Eval::BACKEND_RUN))
+          pid = File.read(exe + '.pid') rescue nil
+          if pid && (Process.kill(0, pid.to_i) rescue false)
+            Process.kill('HUP', pid.to_i) rescue nil
+            false
+          else # its not running, so clean up
+            File.unlink(exe + '.pid') rescue nil
+            true
+          end
         end
       end
     end

data/server/executionhandlers/ruby/execution.rb

@@ -76,27 +76,44 @@ module CPEE
       end
 
       def self::run(id,opts)
-        ### if File file .remote
-          ### connect to remote
-          ### run same as below
-        ### else
-          ### Determine whether we run locally or remote
+        if File.exist? File.join(opts[:instances],id.to_s,'.remote')
+          uri = URI::parse(File.read(File.join(opts[:instances],id.to_s,'.remote')))
+          exe = File.join(uri.path,id.to_s,File.basename(BACKEND_RUN))
+          Net::SSH.start(uri.host,uri.user,:keys => [ opts[:ssh_key] ] ) do |ssh|
+            ssh.exec!("ruby #{exe} >#{exe}.out 2>#{exe}.err &")
+          end
+        else
           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
       end
 
       def self::stop(id,opts) ### return: bool to tell if manually changing redis is necessary
-        exe = File.join(opts[:instances],id.to_s,File.basename(ExecutionHandler::Ruby::BACKEND_RUN))
-        pid = File.read(exe + '.pid') rescue nil
-        if pid && (Process.kill(0, pid.to_i) rescue false)
-          Process.kill('HUP', pid.to_i) rescue nil
-          false
-        else # its not running, so clean up
-          File.unlink(exe + '.pid') rescue nil
-          true
+        if File.exist? File.join(opts[:instances],id.to_s,'.remote')
+          uri = URI::parse(File.read(File.join(opts[:instances],id.to_s,'.remote')))
+          exe = File.join(uri.path,id.to_s,File.basename(BACKEND_RUN))
+          Net::SSH.start(uri.host,uri.user,:keys => [ opts[:ssh_key] ] ) do |ssh|
+            pid = ssh.exec!("cat #{exe}.pid 2>/dev/null")
+            if pid != '' && ssh.exec!("kill -0 #{pid} >/dev/null 2>&1; echo $?").strip == '0'
+              ssh.exec!("kill -SIGHUP #{pid}")
+              false
+            else
+              ssh.exec!("rm #{exe}.pid")
+              true
+            end
+          end
+        else
+          exe = File.join(opts[:instances],id.to_s,File.basename(ExecutionHandler::Ruby::BACKEND_RUN))
+          pid = File.read(exe + '.pid') rescue nil
+          if pid && (Process.kill(0, pid.to_i) rescue false)
+            Process.kill('HUP', pid.to_i) rescue nil
+            false
+          else # its not running, so clean up
+            File.unlink(exe + '.pid') rescue nil
+            true
+          end
         end
       end
     end

data/server/routing/end.pid

@@ -1 +1 @@
-577032
+601746

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

@@ -1 +1 @@
-577074
+601788

data/server/routing/forward-votes.pid

@@ -1 +1 @@
-577060
+601774

data/server/routing/persist.pid

@@ -1 +1 @@
-577046
+601760

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cpee
 version: !ruby/object:Gem::Version
-  version: 2.1.104
+  version: 2.1.106
 platform: ruby
 authors:
 - Juergen eTM Mangler