cpee 2.1.12 → 2.1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 18b365831308d00c63c51738bb800255bb0fe6813f4cf368e7ec60b32609a2b8
-  data.tar.gz: a777bc87bcea1990238ff50950a0179c8b9076774496a53ed7bb1eedc2cb875c
+  metadata.gz: a36325365a950ed863e1d8f225d3d9c0fe955c03d9e8d54ef5a3b92366bffeea
+  data.tar.gz: 2579cb64ec6d53369b89f9ae2bd296422d5a9aafb527cfe4d7b4397702e15571
 SHA512:
-  metadata.gz: 6b4c1476fffb5bfa7b7bbadebc9af1cdf2a8b8703ff15f4378946661613e95be0b3fbf54416637d63e4410f5563a723ca0e91a3fddaaeeb5e60a49e63e82eecd
-  data.tar.gz: 1f274d19467c64173562ba9d01dd97c192dd1b2a5ce15556d866c00fa0908e13666361b59bda02f5222b04c68a131940ac942b633c4cefcc4bb7e1e240c52873
+  metadata.gz: 198bfa6332b16087dd108170166e4d91b92e82bb51e9853d72ad1fd2e152a3a5bee856c138a91598f63881a49897dbfed16fa4193732e1d55f7a5484476aa6fd
+  data.tar.gz: a068a5abf6abb788b8759ced41339db138b4775d0ca2c1be4f89e1d191205379632c8c36069b799f6475f04f57b53aac2f646aad8265e2ab6182733200780535

data/cpee.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee"
-  s.version          = "2.1.12"
+  s.version          = "2.1.13"
   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/implementation.rb

@@ -77,7 +77,7 @@ module CPEE
     opts[:redis_pid]                  ||= 'redis.pid' # use e.g. /var/run/redis.pid if you do global. Look it up in your redis config
     opts[:redis_db_name]              ||= 'redis.rdb' # use e.g. /var/lib/redis.rdb for global stuff. Look it up in your redis config
 
-    CPEE::redis_connect opts
+    CPEE::redis_connect opts, 'Server Main'
 
     opts[:sse_keepalive_frequency]    ||= 10
     opts[:sse_connections]            = {}

data/lib/cpee/implementation_notifications.rb

@@ -179,7 +179,7 @@ module CPEE
     end #}}}
 
     def self::sse_distributor(opts) #{{{
-      conn = opts[:redis_dyn].call
+      conn = opts[:redis_dyn].call "Server SSE"
       conn.psubscribe('forward:*','event:state/change') do |on|
         on.pmessage do |pat, what, message|
           if pat == 'forward:*'

data/lib/cpee/redis.rb

@@ -15,29 +15,30 @@
 require 'redis'
 
 module CPEE
-  def self::redis_connect(opts)
+  def self::redis_connect(opts,name=nil)
     if opts[:redis_cmd].nil?
       begin
         if opts[:redis_path]
-          opts[:redis_dyn] = Proc.new { Redis.new(path: opts[:redis_path], db: opts[:redis_db]) }
+          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 { Redis.new(url: opts[:redis_url], db: opts[:redis_db]) }
+          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] = opts[:redis_dyn].call
+        opts[:redis] = opts[:redis_dyn].call name.gsub(/[^a-zA-Z0-9]/,'-')
         opts[:redis].dbsize
       rescue
         puts 'can not connect to redis. check if it is running and cpee is configured correctly ...'
         exit
       end
     else # we always assume file socket if redis is startet locally
-      opts[:redis_dyn] = Proc.new { Redis.new(path: File.join(opts[:basepath],opts[:redis_path]), db: opts[:redis_db].to_i) }
+      opts[:redis_dyn] = 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]/,'-') ) }
       tried = false
       begin
-        opts[:redis] = opts[:redis_dyn].call
+        opts[:redis] = opts[:redis_dyn].call name.gsub(/[^a-zA-Z0-9]/,'-')
         opts[:redis].dbsize
-      rescue
+      rescue => e
+        puts e
         res = unless tried
           rcmd = opts[:redis_cmd]
           rcmd.gsub! /#redis_path#/, File.join(opts[:basepath],opts[:redis_path])

data/server/executionhandlers/ruby/controller.rb

@@ -33,7 +33,7 @@ def ⭐(a); ParaStruct.new(a); end
 
 class Controller
   def initialize(id,dir,opts)
-    CPEE::redis_connect(opts)
+    CPEE::redis_connect(opts,"Instance #{id}")
 
     @redis = opts[:redis]
     @votes = []
@@ -52,7 +52,7 @@ class Controller
     @loop_guard = {}
 
     @callback_keys = {}
-    @psredis = @opts[:redis_dyn].call
+    @psredis = @opts[:redis_dyn].call "Instance #{@id} Callback Response"
 
     Thread.new do
       @psredis.psubscribe('callback-response:*','callback-end:*') do |on|
@@ -163,7 +163,7 @@ class Controller
 
     if votes.length > 0
       @votes += votes
-      psredis = @opts[:redis_dyn].call
+      psredis = @opts[:redis_dyn].call "Instance #{@id} Vote"
       collect = []
       psredis.subscribe(votes.map{|e| ['vote-response:' + e.to_s] }.flatten) do |on|
         on.message do |what, message|

data/server/routing/end.rb

@@ -30,8 +30,8 @@ Daemonite.new do |opts|
     opts[:redis_path] ||= '/tmp/redis.sock'
     opts[:redis_db] ||= 1
 
-    CPEE::redis_connect opts
-    opts[:pubsubredis] = opts[:redis_dyn].call
+    CPEE::redis_connect opts, 'Server Routing End'
+    opts[:pubsubredis] = opts[:redis_dyn].call 'Server Routing End Sub'
   end
 
   run do

data/server/routing/forward-events.rb

@@ -30,8 +30,8 @@ Daemonite.new do |opts|
     opts[:redis_path] ||= '/tmp/redis.sock'
     opts[:redis_db] ||= 1
 
-    CPEE::redis_connect opts
-    opts[:pubsubredis] = opts[:redis_dyn].call
+    CPEE::redis_connect opts, 'Server Routing Forward Events'
+    opts[:pubsubredis] = opts[:redis_dyn].call 'Server Routing Forward Events Sub'
   end
 
   run do

data/server/routing/forward-votes.rb

@@ -56,8 +56,8 @@ Daemonite.new do |opts|
     opts[:redis_path] ||= '/tmp/redis.sock'
     opts[:redis_db] ||= 1
 
-    CPEE::redis_connect opts
-    opts[:pubsubredis] = opts[:redis_dyn].call
+    CPEE::redis_connect opts, 'Server Routing Forward Votes'
+    opts[:pubsubredis] = opts[:redis_dyn].call 'Server Routing Forward Votes Sub'
   end
 
   run do

data/server/routing/persist.rb

@@ -45,8 +45,8 @@ Daemonite.new do |opts|
     opts[:redis_path] ||= '/tmp/redis.sock'
     opts[:redis_db] ||= 1
 
-    CPEE::redis_connect opts
-    opts[:pubsubredis] = opts[:redis_dyn].call
+    CPEE::redis_connect opts, 'Server Routing Persist'
+    opts[:pubsubredis] = opts[:redis_dyn].call 'Server Routing Persist Sub'
   end
 
   run do

metadata

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