cpee 2.1.39 → 2.1.43

data/cockpit/themes/packed/symbols/start_event.svg

@@ -1,5 +1,5 @@
 <svg class="clickable" xmlns="http://www.w3.org/2000/svg">
   <circle cx="15" cy="15" r="14" class="cline stand"/>
-  <rect x="7" y="9" width="16" height="12" class="black" style="fill: none"/>
-  <path d="m 7,9 8,6 8,-6" class="black" style="fill: none"/>
+  <rect x="7" y="10" width="16" height="11" class="black" style="fill: none"/>
+  <path d="m 7,10 8,6 8,-6" class="black" style="fill: none"/>
 </svg>

data/cockpit/themes/packed/symbols/test.svg

@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   class="clickable"
+   version="1.1"
+   id="svg10"
+   sodipodi:docname="test.svg"
+   inkscape:version="1.0.2 (e86c870879, 2021-01-15)">
+  <metadata
+     id="metadata16">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs14" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="2062"
+     inkscape:window-height="1298"
+     id="namedview12"
+     showgrid="false"
+     inkscape:zoom="35.146667"
+     inkscape:cx="13.036699"
+     inkscape:cy="13.350011"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg10" />
+  <rect
+     transform="rotate(45,14,12)"
+     x="7"
+     y="3"
+     width="21"
+     height="21"
+     class="cline hfill stand"
+     id="rect2"
+     style="fill:#3465a4" />
+  <circle
+     cx="15.5"
+     cy="15.5"
+     r="7"
+     class="stand"
+     id="circle4" />
+  <circle
+     cx="15.5"
+     cy="15.5"
+     r="7"
+     class="stand"
+     id="circle6" />
+  <path
+     d="m 15.500001,11.435193 3.825246,2.779205 -1.461114,4.496849 h -4.728265 l -1.461115,-4.496849 z"
+     class="stand"
+     id="path8"
+     style="fill:#ef2929;stroke-width:1" />
+</svg>

data/cockpit/themes/preset/symbols/start_event.svg

@@ -1,5 +1,5 @@
 <svg class="clickable" xmlns="http://www.w3.org/2000/svg">
   <circle cx="15" cy="15" r="14" class="cline stand"/>
-  <rect x="7" y="9" width="16" height="12" class="black" style="fill: none"/>
-  <path d="m 7,9 8,6 8,-6" class="black" style="fill: none"/>
+  <rect x="7" y="10" width="16" height="11" class="black" style="fill: none"/>
+  <path d="m 7,10 8,6 8,-6" class="black" style="fill: none"/>
 </svg>

data/cockpit/themes/preset/symbols/test.svg

@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   class="clickable"
+   version="1.1"
+   id="svg10"
+   sodipodi:docname="test.svg"
+   inkscape:version="1.0.2 (e86c870879, 2021-01-15)">
+  <metadata
+     id="metadata16">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs14" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="2062"
+     inkscape:window-height="1298"
+     id="namedview12"
+     showgrid="false"
+     inkscape:zoom="35.146667"
+     inkscape:cx="13.036699"
+     inkscape:cy="13.350011"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg10" />
+  <rect
+     transform="rotate(45,14,12)"
+     x="7"
+     y="3"
+     width="21"
+     height="21"
+     class="cline hfill stand"
+     id="rect2"
+     style="fill:#3465a4" />
+  <circle
+     cx="15.5"
+     cy="15.5"
+     r="7"
+     class="stand"
+     id="circle4" />
+  <circle
+     cx="15.5"
+     cy="15.5"
+     r="7"
+     class="stand"
+     id="circle6" />
+  <path
+     d="m 15.500001,11.435193 3.825246,2.779205 -1.461114,4.496849 h -4.728265 l -1.461115,-4.496849 z"
+     class="stand"
+     id="path8"
+     style="fill:#ef2929;stroke-width:1" />
+</svg>

data/cpee.gemspec

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

@@ -54,7 +54,7 @@ module CPEE
     /p:properties/p:attributes/p:*
   }
   def self::implementation(opts)
-    opts[:see_instances]              ||= opts[:see_instances].nil? ? true : opts[:see_instances]
+    opts[:see_instances]              ||= opts[:see_instances].nil? ? false : opts[:see_instances]
 
     opts[:instances]                  ||= File.expand_path(File.join(__dir__,'..','..','server','instances'))
     opts[:global_executionhandlers]   ||= File.expand_path(File.join(__dir__,'..','..','server','executionhandlers'))
@@ -69,6 +69,9 @@ module CPEE
     opts[:watchdog_frequency]         ||= 7
     opts[:watchdog_start_off]         ||= false
     opts[:infinite_loop_stop]         ||= 10000
+    opts[:workers]                    ||= 1
+    opts[:workers_single]             ||= ['end','persist','forward-votes']
+    opts[:workers_multi]              ||= ['forward-events']
 
     opts[:dashing_frequency]          ||= 3
     opts[:dashing_target]             ||= nil
@@ -107,11 +110,12 @@ module CPEE
       Dir[File.join(opts[:executionhandlers],'*','execution.rb')].each do |h|
         require h
       end unless opts[:executionhandlers].nil? || opts[:executionhandlers].strip == ''
+      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])
+        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])
         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])
+          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])
         end
         EM.defer do ### catch all sse connections
           CPEE::Notifications::sse_distributor(opts)
@@ -200,31 +204,54 @@ module CPEE
     end
   end
 
-  def self::watch_services(watchdog_start_off,url,path,db)
+  def self::watch_services(watchdog_start_off,url,path,db,workers,workers_single,workers_multi)
     return if watchdog_start_off
-     EM.defer do
-       Dir[File.join(__dir__,'..','..','server','routing','*.rb')].each do |s|
-         s = s.sub(/\.rb$/,'')
-         pid = (File.read(s + '.pid').to_i rescue nil)
-         if (pid.nil? || !(Process.kill(0, pid) rescue false)) && !File.exist?(s + '.lock')
-           if url.nil?
-             system "#{s}.rb -p \"#{path}\" -d #{db} restart 1>/dev/null 2>&1"
-           else
-             system "#{s}.rb -u \"#{url}\" -d #{db} restart 1>/dev/null 2>&1"
-           end
-           puts "➡ Service #{File.basename(s,'.rb')} started ..."
-         end
-       end
+    EM.defer do
+      workers_single.each do |s|
+        s = File.join(__dir__,'..','..','server','routing',s)
+        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
+          system "#{s}.rb " + cmd + " 1>/dev/null 2>&1"
+          puts "➡ Service #{File.basename(s)} (#{cmd}) started ..."
+        end
+      end
+      workers_multi.each do |s|
+        s = File.join(__dir__,'..','..','server','routing',s.to_s)
+        next if File.exist?(s + '.lock')
+        (0...workers).each do |w|
+          w = '%02i' % w
+          pid = (File.read(s + '-' + w + '.pid').to_i rescue nil)
+          if (pid.nil? || !(Process.kill(0, pid) rescue false))
+            cmd = if url.nil?
+              "-p \"#{path}\" -d #{db} -w #{w} restart"
+            else
+              "-u \"#{url}\" -d #{db} -w #{w} restart"
+            end
+            system "#{s}.rb " + cmd + " 1>/dev/null 2>&1"
+            puts "➡ Service #{File.basename(s)}-#{w} (#{cmd}) started ..."
+          end
+        end
+      end
     end
   end
   def self::cleanup_services(watchdog_start_off)
     return if watchdog_start_off
-    Dir[File.join(__dir__,'..','..','server','routing','*.rb')].each do |s|
-      s = s.sub(/\.rb$/,'')
-      pid = (File.read(s + '.pid').to_i rescue nil)
+    Dir[File.join(__dir__,'..','..','server','routing','*.pid')].each do |s|
+      pid = (File.read(s).to_i rescue nil)
       if !pid.nil? || (Process.kill(0, pid) rescue false)
-        system "#{s}.rb stop 1>/dev/null 2>&1"
-        puts "➡ Service #{File.basename(s,'.rb')} stopped ..."
+        f = s.sub(/(-(\d+))?\.pid$/,'.rb')
+        if $2.nil?
+          system "#{f} stop 1>/dev/null 2>&1"
+        else
+          system "#{f} -w #{$2} stop 1>/dev/null 2>&1"
+        end
+        puts "➡ Service #{File.basename(s,'.pid')} stopped ..."
       end
     end
   end
@@ -232,7 +259,6 @@ module CPEE
   class Instances < Riddl::Implementation #{{{
     def response
       opts = @a[0]
-      pp @request[:env]['REMOTE_ADDR']
       if opts[:see_instances] || @h['SEE_INSTANCES'] == 'true'
         Riddl::Parameter::Complex.new("wis","text/xml") do
           ins = XML::Smart::string('<instances/>')
@@ -363,15 +389,12 @@ module CPEE
         CPEE::Message::send(:event,'state/change',File.join(opts[:url],'/'),id,content[:attributes]['uuid'],content[:attributes]['info'],content,redis)
       end
 
-      EM::add_timer(30) do
-        empt = CPEE::Persistence::keys(id,opts).to_a
-        ### is there to avoid that returning calls get intro problems
-        ### as we have add_timer now, it should work without this
-        # empt.delete_if{|e| e =~ /\/handlers/ }
-        redis.multi do |multi|
-          multi.del empt
-          multi.zrem 'instances', id
+      empt = CPEE::Persistence::keys(id,opts).to_a
+      redis.multi do |multi|
+        empt.each do |e|
+          multi.expire e, 30
         end
+        multi.zrem 'instances', id
       end
     end
   end #}}}

data/lib/cpee/message.rb

@@ -18,7 +18,17 @@ module CPEE
     WHO = 'cpee'
     TYPE = 'instance'
 
-    def self::send(type, event, cpee, instance, instance_uuid, instance_name, content={}, backend)
+    def self::set_workers(workers)
+      @@tworkers = (workers < 1 && workers > 99 ? 1 : workers).freeze
+      @@last = -1
+    end
+
+    def self::target
+      @@last < @@tworkers-1 ? @@last += 1 : @@last = 0
+    end
+
+    def self::send(type, event, cpee, instance, instance_uuid, instance_name, content={}, backend=nil)
+      target = '%02i' % CPEE::Message::target
       topic = ::File::dirname(event)
       name = ::File::basename(event)
       payload = {
@@ -33,7 +43,8 @@ module CPEE
       }
       payload[TYPE + '-uuid'] = instance_uuid if instance_uuid
       payload[TYPE + '-name'] = instance_name if instance_name
-      backend.publish(type.to_s + ':' + event,
+
+      backend.publish(type.to_s + ':' + target + ':' + event.to_s,
         instance.to_s + ' ' +
         JSON::generate(payload)
       )
@@ -52,14 +63,12 @@ module CPEE
           'content' => content
         }
         client = Riddl::Client.new(backend)
-        p backend
         client.post [
           Riddl::Parameter::Simple::new('type',type),
           Riddl::Parameter::Simple::new('topic',topic),
           Riddl::Parameter::Simple::new('event',name),
           Riddl::Parameter::Complex::new('notification','application/json',JSON::generate(payload))
         ]
-        p backend + '------'
       end
     end
   end

data/server/executionhandlers/ruby/controller.rb

@@ -35,6 +35,7 @@ def ⭐(a); ParaStruct.new(a); end
 class Controller
   def initialize(id,dir,opts)
     CPEE::redis_connect(opts,"Instance #{id}")
+    CPEE::Message::set_workers(opts[:workers])
 
     @redis = opts[:redis]
     @votes = []
@@ -58,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/executionhandlers/ruby/dsl_to_dslx.xsl

@@ -374,17 +374,7 @@
         <xsl:value-of select="$myspace+$myspacemultiplier"/>
       </xsl:with-param>
     </xsl:call-template>
-    <xsl:text>parallel_branch</xsl:text>
-    <xsl:if test="@pass">
-      <xsl:text> </xsl:text>
-      <xsl:value-of select="@pass"/>
-    </xsl:if>
-    <xsl:text> do</xsl:text>
-    <xsl:if test="@local">
-      <xsl:text> |</xsl:text>
-      <xsl:value-of select="@local"/>
-      <xsl:text>|</xsl:text>
-    </xsl:if>
+    <xsl:text>parallel_branch data do |local|</xsl:text>
     <xsl:call-template name="print-newline"/>
     <xsl:apply-templates>
       <xsl:with-param name="myspace">

data/server/executionhandlers/ruby/execution.rb

@@ -46,6 +46,7 @@ module CPEE
             :redis_url => opts[:redis_url],
             :redis_path => File.join(opts[:basepath],opts[:redis_path]),
             :redis_db => opts[:redis_db],
+            :workers => opts[:workers],
             :global_executionhandlers => opts[:global_executionhandlers],
             :executionhandlers => opts[:executionhandlers],
             :executionhandler => hw

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
@@ -37,7 +38,7 @@ Daemonite.new do |opts|
   run do
     opts[:pubsubredis].psubscribe('callback-end:*') do |on|
       on.pmessage do |pat, what, message|
-        _, key = what.split(':')
+        _, worker, key = what.split(':',3)
         index = message.index(' ')
         instance = message[0...index]
         opts[:redis].multi do |multi|

data/server/routing/forward-events.rb

@@ -23,25 +23,30 @@ 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_db] ||= 1
-
     CPEE::redis_connect opts, 'Server Routing Forward Events'
     opts[:pubsubredis] = opts[:redis_dyn].call 'Server Routing Forward Events Sub'
   end
 
   run do
-    opts[:pubsubredis].psubscribe('event:*') do |on|
+    opts[:pubsubredis].psubscribe("event:#{opts[:worker]}:*") do |on|
       on.pmessage do |pat, what, message|
         index = message.index(' ')
         mess = message[index+1..-1]
         instance = message[0...index]
-        type = pat[0..-3]
-        event = what[(type.length+1)..-1]
+        type, worker, event = what.split(':',3)
         topic = ::File::dirname(event)
         name = ::File::basename(event)
         long = File.join(topic,type,name)
@@ -51,14 +56,16 @@ Daemonite.new do |opts|
             if url.nil? || url == ""
               opts[:redis].publish("forward:#{instance}/#{key}",mess)
             else
-              p "#{type}/#{topic}/#{event}-#{url}"
-              client = Riddl::Client.new(url)
-              client.post [
-                Riddl::Parameter::Simple::new('type',type),
-                Riddl::Parameter::Simple::new('topic',topic),
-                Riddl::Parameter::Simple::new('event',name),
-                Riddl::Parameter::Complex::new('notification','application/json',mess)
-              ]
+              # Ractor.new(url,type,topic,name,mess) do |url,type,topic,name,mess|
+              # sadly typhoes does not support ractors
+              Thread.new do
+                Riddl::Client.new(url).post [
+                  Riddl::Parameter::Simple::new('type',type),
+                  Riddl::Parameter::Simple::new('topic',topic),
+                  Riddl::Parameter::Simple::new('event',name),
+                  Riddl::Parameter::Complex::new('notification','application/json',mess)
+                ]
+              end
             end
           end
         end

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
@@ -64,11 +65,10 @@ Daemonite.new do |opts|
     opts[:pubsubredis].psubscribe('vote:*') do |on|
       on.pmessage do |pat, what, message|
         index = message.index(' ')
+        instance = message[0...index]
         mess = message[index+1..-1]
 
-        instance = message[0...index]
-        type = pat[0..-3]
-        event = what[(type.length+1)..-1]
+        type, worker, event = what.split(':',3)
         topic = ::File::dirname(event)
         name = ::File::basename(event)
         long = File.join(topic,type,name)