cpee 2.1.29 → 2.1.33

data/lib/cpee/implementation.rb

@@ -16,6 +16,7 @@ require 'fileutils'
 require 'redis'
 require 'riddl/server'
 require 'riddl/client'
+require_relative 'fail'
 require_relative 'redis'
 require_relative 'message'
 require_relative 'persistence'
@@ -67,6 +68,9 @@ module CPEE
     opts[:watchdog_start_off]         ||= false
     opts[:infinite_loop_stop]         ||= 10000
 
+    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
@@ -83,7 +87,7 @@ module CPEE
     opts[:sse_connections]            = {}
 
     opts[:statemachine]               = CPEE::StateMachine.new opts[:states], %w{running simulating replaying finishing stopping abandoned finished} do |id|
-      opts[:redis].get("instance:#{id}/state")
+      CPEE::Persistence::extract_item(id,opts,"state")
     end
 
     opts[:runtime_cmds]               << [
@@ -113,6 +117,55 @@ module CPEE
         EM.add_periodic_timer(opts[:sse_keepalive_frequency]) do
           CPEE::Notifications::sse_heartbeat(opts)
         end
+
+        if opts[:dashing_target]
+          cpu_last = 0
+          idl_last = 0
+          EM.add_periodic_timer(opts[:dashing_frequency]) do
+            src = `cat /proc/stat | head -n 1`.split("\n")
+            srm = `cat /proc/meminfo`.split("\n")
+            sc = {}
+            sm = {}
+            src.each do |e|
+              x = e.split(' ')
+              sc[x[0]] = x[1..-1].map{|r| r.to_i}
+            end
+            srm.each do |e|
+              x = e.split(/\s+/)
+              sm[x[0].chop] = x[1].to_i
+            end
+            scc = 0
+            sci = 0
+            sc.each do |_,e|
+              scc = e[0..4].sum
+              sci = e[3]
+            end
+            cpu_delta = scc - cpu_last
+            cpu_idle  = sci - idl_last
+            cpu_used  = cpu_delta - cpu_idle
+            cpu_usage = '%.2f' % (100 * cpu_used / cpu_delta.to_f)
+            mem_tot   = '%.1f' % (sm['MemTotal']/1024.0)
+            mem_fre   = '%.1f' % (sm['MemFree']/1024.0)
+            mem_ava   = '%.1f' % (sm['MemAvailable']/1024.0)
+            mem_buc   = '%.1f' % ((sm['Buffers'] + sm['Cached'] + sm['SReclaimable'])/1024.0)
+            mem_usd   = '%.1f' % ((sm['MemTotal'] - sm['MemFree'] - sm['Buffers'] - sm['Cached'] - sm['SReclaimable'])/1024.0)
+
+            # puts "CPU usage at #{cpu_usage}%"
+            # puts "Mem usage at #{mem_tot}/#{mem_fre}/#{mem_usd}/#{mem_buc}/#{mem_ava}"
+            content = {}
+            content['cpu_usage'] = cpu_usage
+            content['mem_total'] = mem_tot
+            content['mem_free'] = mem_fre
+            content['mem_available'] = mem_ava
+            content['mem_bufferedandcached'] = mem_buc
+            content['mem_used'] = mem_usd
+            CPEE::Message::send_url(:event,'node/resource_utilization',File.join(opts[:url],'/'),content,File.join(opts[:dashing_target],'/dash/events'))
+
+            # Keep this as last for our next read
+            idl_last = sci
+            cpu_last = scc
+          end
+        end
       end
 
       cleanup do
@@ -176,16 +229,14 @@ module CPEE
 
   class Instances < Riddl::Implementation #{{{
     def response
-      redis = @a[0][:redis]
+      opts = @a[0]
       Riddl::Parameter::Complex.new("wis","text/xml") do
         ins = XML::Smart::string('<instances/>')
-        redis.zrevrange('instances',0,-1).each do |instance|
-          statekey = "instance:#{instance}/state"
-          attributes = "instance:#{instance}/attributes/"
-          info = redis.get(attributes + 'info')
-          uuid = redis.get(attributes + 'uuid')
-          state = redis.get(statekey)
-          state_changed = redis.get(File.join(statekey,'@changed'))
+        CPEE::Persistence::each_object(opts) do |instance|
+          info = CPEE::Persistence::extract_item(instance,opts,'attributes/info')
+          uuid = CPEE::Persistence::extract_item(instance,opts,'attributes/uuid')
+          state = CPEE::Persistence::extract_item(instance,opts,'state')
+          state_changed = CPEE::Persistence::extract_item(instance,opts,'state/@changed')
           ins.root.add('instance', info,  'uuid' => uuid, 'id' => instance, 'state' => state, 'state_changed' => state_changed )
         end
         ins.to_s
@@ -209,9 +260,9 @@ module CPEE
       doc = XML::Smart::open_unprotected(opts[:properties_init])
       doc.register_namespace 'p', 'http://cpee.org/ns/properties/2.0'
       name     = @p[0].value
-      id       = redis.zrevrange('instances', 0, 0).first.to_i + 1
+      id       = CPEE::Persistence::new_object(opts)
       uuid     = SecureRandom.uuid
-      instance = 'instance:' + id.to_s
+      instance = CPEE::Persistence::OBJ + ':' + id.to_s
       redis.multi do |multi|
         multi.zadd('instances',id,id)
         doc.root.find(PROPERTIES_PATHS_FULL.join(' | ')).each do |e|
@@ -235,12 +286,12 @@ module CPEE
             doc.register_namespace 'np', 'http://riddl.org/ns/common-patterns/notifications-producer/2.0'
             key = File.basename(File.dirname(f))
             url = doc.find('string(/np:subscription/@url)')
-            multi.sadd("instance:#{id}/handlers",key)
-            multi.set("instance:#{id}/handlers/#{key}/url",url)
+            multi.sadd(CPEE::Persistence::OBJ + ":#{id}/handlers",key)
+            multi.set(CPEE::Persistence::OBJ + ":#{id}/handlers/#{key}/url",url)
             doc.find('/np:subscription/np:topic/*').each do |e|
               c = File.join(e.parent.attributes['id'],e.qname.name,e.text)
-              multi.sadd("instance:#{id}/handlers/#{key}",c)
-              multi.sadd("instance:#{id}/handlers/#{c}",key)
+              multi.sadd(CPEE::Persistence::OBJ + ":#{id}/handlers/#{key}",c)
+              multi.sadd(CPEE::Persistence::OBJ + ":#{id}/handlers/#{c}",key)
             end
           end rescue nil # all the ones that are not ok, are ignored
         end
@@ -251,6 +302,12 @@ module CPEE
         multi.set(File.join(instance, 'state', '@changed'), Time.now.xmlschema(3))
       end
 
+      content = {
+        :state => 'ready',
+        :attributes => CPEE::Persistence::extract_list(id,opts,'attributes').to_h
+      }
+      CPEE::Message::send(:event,'state/change',File.join(opts[:url],'/'),id,uuid,name,content,redis)
+
       @headers << Riddl::Header.new("CPEE-INSTANCE", id.to_s)
       @headers << Riddl::Header.new("CPEE-INSTANCE-URL", File.join(opts[:url].to_s,id.to_s,'/'))
       @headers << Riddl::Header.new("CPEE-INSTANCE-UUID", uuid)
@@ -289,7 +346,18 @@ module CPEE
         @status = 404
         return
       end
-      empt = redis.keys("instance:#{id}/*").to_a
+
+      content = {
+        :state => 'purged',
+        :attributes => CPEE::Persistence::extract_list(id,opts,'attributes').to_h
+      }
+      state = CPEE::Persistence::extract_item(id,opts,'state')
+      if state == 'stopped' || state == 'ready'
+        CPEE::Message::send(:event,'state/change',File.join(opts[:url],'/'),id,content[:attributes]['uuid'],content[:attributes]['info'],content,redis)
+      end
+
+      empt = CPEE::Persistence::keys(id,opts).to_a
+      empt.delete_if{|e| e =~ /\/handlers/ }
       redis.multi do |multi|
         multi.del empt
         multi.zrem 'instances', id
@@ -297,11 +365,4 @@ module CPEE
     end
   end #}}}
 
-    class FAIL < Riddl::Implementation #{{{
-      def response
-        @status = 404
-        nil
-      end
-    end #}}}
-
 end

data/lib/cpee/implementation_callbacks.rb

@@ -13,6 +13,7 @@
 # <http://www.gnu.org/licenses/>.
 
 require 'json'
+require_relative 'fail'
 
 module CPEE
   module Callbacks
@@ -54,13 +55,13 @@ module CPEE
         opts = @a[1]
         callback = @r[-1]
 
-        if opts[:redis].sismember("instance:#{id}/callbacks",callback)
+        if CPEE::Persistence::is_member?(id,opts,'callbacks',callback)
           res = {}
-          res[:uuid] = opts[:redis].get("instance:#{id}/callback/#{callback}/uuid")
-          res[:type] = opts[:redis].get("instance:#{id}/callback/#{callback}/type")
-          res[:position] = opts[:redis].get("instance:#{id}/callback/#{callback}/position")
-          res[:label] = opts[:redis].get("instance:#{id}/callback/#{callback}/label")
-          if sub = opts[:redis].get("instance:#{id}/callback/#{callback}/subscription")
+          res[:uuid]     = CPEE::Persistence::extract_item(id,opts,"callback/#{callback}/uuid")
+          res[:type]     = CPEE::Persistence::extract_item(id,opts,"callback/#{callback}/type")
+          res[:position] = CPEE::Persistence::extract_item(id,opts,"callback/#{callback}/position")
+          res[:label]    = CPEE::Persistence::extract_item(id,opts,"callback/#{callback}/label")
+          if sub = CPEE::Persistence::extract_item(id,opts,"callback/#{callback}/subscription")
             res[:subscription] = sub
           end
 
@@ -77,7 +78,7 @@ module CPEE
         opts = @a[1]
         callback = @r[-1]
 
-        if opts[:redis].get("instance:#{id}/callback/#{callback}/type") == 'callback'
+        if CPEE::Persistence::extract_item(id,opts,"callback/#{callback}/type") == 'callback'
           CPEE::Message::send(
             :'callback-end',
             callback,
@@ -88,7 +89,7 @@ module CPEE
             {},
             opts[:redis]
           )
-        elsif opts[:redis].get("instance:#{id}/callback/#{callback}/type") == 'vote'
+        elsif CPEE::Persistence::extract_item(id,opts,"callback/#{callback}/type") == 'vote'
           CPEE::Message::send(
             :'vote-response',
             callback,
@@ -112,7 +113,7 @@ module CPEE
         opts = @a[1]
         callback = @r[-1]
 
-        if opts[:redis].get("instance:#{id}/callback/#{callback}/type") == 'callback'
+        if CPEE::Persistence::extract_item(id,opts,"callback/#{callback}/type") == 'callback'
           ret = {}
           ret['values'] = @p.map{ |e|
             [e.name, e.class == Riddl::Parameter::Simple ? [:simple,e.value] : [:complex,e.mimetype,e.value.path] ]
@@ -129,7 +130,7 @@ module CPEE
             ret,
             opts[:redis]
           )
-        elsif opts[:redis].get("instance:#{id}/callback/#{callback}/type") == 'vote'
+        elsif CPEE::Persistence::extract_item(id,opts,"callback/#{callback}/type") == 'vote'
           if @p.length == 1 && @p[0].name == 'continue' && @p[0].class == Riddl::Parameter::Simple
             CPEE::Message::send(
               :'vote-response',

data/lib/cpee/implementation_notifications.rb

@@ -13,6 +13,7 @@
 # <http://www.gnu.org/licenses/>.
 
 require 'json'
+require_relative 'fail'
 
 module CPEE
   module Notifications
@@ -188,7 +189,7 @@ module CPEE
         on.pmessage do |pat, what, message|
           if pat == 'forward:*'
             id, key = what.match(/forward:([^\/]+)\/(.+)/).captures
-            if sse = opts.dig(:sse_connections,id.to_i,key)
+            if sse = opts.dig(:sse_connections,id,key)
               sse.send message
             else
               DeleteSubscription::set(id,opts,key)
@@ -197,7 +198,7 @@ module CPEE
             mess = JSON.parse(message[message.index(' ')+1..-1])
             state = mess.dig('content','state')
             if state == 'finished' || state == 'abandoned'
-              opts.dig(:sse_connections,mess.dig('instance').to_i)&.each do |key,sse|
+              opts.dig(:sse_connections,mess.dig('instance').to_s)&.each do |key,sse|
                 EM.add_timer(10) do # just to be sure that all messages arrived. 10 seconds should be enough ... we think ... therefore we are (not sure)
                   sse.close
                 end
@@ -218,7 +219,7 @@ module CPEE
     class SSE < Riddl::SSEImplementation #{{{
       def onopen
         @opts = @a[1]
-        @id = @a[0]
+        @id = @a[0].to_s
         @key = @r[-2]
         if CPEE::Persistence::exists_handler?(@id,@opts,@key)
           @opts[:sse_connections][@id] ||= {}

data/lib/cpee/implementation_properties.rb

@@ -13,6 +13,7 @@
 # <http://www.gnu.org/licenses/>.
 
 require_relative 'attributes_helper'
+require_relative 'fail'
 require_relative 'value_helper'
 require 'json'
 require 'erb'
@@ -226,7 +227,7 @@ module CPEE
     end #}}}
     class PutState < Riddl::Implementation #{{{
       def self::set(id,opts,state)
-        CPEE::Persistence::set_item(id,opts,'state',:state => state, :timestamp => Time.now.xmlschema(3))
+        CPEE::Persistence::set_item(id,opts,'state',:state => state, :attributes => CPEE::Persistence::extract_list(id,opts,'attributes').to_h)
       end
 
       def self::run(id,opts,state)

data/lib/cpee/message.rb

@@ -15,28 +15,50 @@
 module CPEE
 
   module Message
+    WHO = 'cpee'
+    TYPE = 'instance'
 
     def self::send(type, event, cpee, instance, instance_uuid, instance_name, content={}, backend)
       topic = ::File::dirname(event)
       name = ::File::basename(event)
+      payload = {
+        WHO => cpee,
+        TYPE + '-url' => File.join(cpee,instance.to_s),
+        TYPE => instance,
+        'topic' => topic,
+        'type' => type,
+        'name' => name,
+        'timestamp' =>  Time.now.xmlschema(3),
+        'content' => content
+      }
+      payload[TYPE + '-uuid'] = instance_uuid if instance_uuid
+      payload[TYPE + '-name'] = instance_name if instance_name
       backend.publish(type.to_s + ':' + event,
         instance.to_s + ' ' +
-        JSON::generate(
-          { 'cpee' => cpee,
-            'instance-url' => File.join(cpee,instance.to_s),
-            'instance-uuid' => instance_uuid,
-            'instance-name' => instance_name,
-            'instance' => instance,
-            'topic' => topic,
-            'type' => type,
-            'name' => name,
-            'timestamp' =>  Time.now.xmlschema(3),
-            'content' => content
-          }
-        )
+        JSON::generate(payload)
       )
     end
 
+    def self::send_url(type, event, cpee, content={}, backend)
+      topic = ::File::dirname(event)
+      name = ::File::basename(event)
+      client = Riddl::Client.new(backend)
+      payload = {
+        WHO => cpee,
+        'topic' => topic,
+        'type' => type,
+        'name' => name,
+        'timestamp' =>  Time.now.xmlschema(3),
+        'content' => content
+      }
+      client = Riddl::Client.new(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))
+      ]
+    end
   end
 
 end

data/lib/cpee/persistence.rb

@@ -15,6 +15,8 @@
 module CPEE
 
   module Persistence
+    OBJ = 'instance'
+
     def self::set_list(id,opts,item,values,deleted=[]) #{{{
       ah = AttributesHelper.new
       attributes = Persistence::extract_list(id,opts,'attributes').to_h
@@ -37,13 +39,13 @@ module CPEE
       )
     end #}}}
     def self::extract_set(id,opts,item) #{{{
-      opts[:redis].smembers("instance:#{id}/#{item}").map do |e|
-        [e,opts[:redis].get("instance:#{id}/#{item}/#{e}")]
+      opts[:redis].smembers(OBJ + ":#{id}/#{item}").map do |e|
+        [e,opts[:redis].get(OBJ + ":#{id}/#{item}/#{e}")]
       end
     end #}}}
     def self::extract_list(id,opts,item) #{{{
-      opts[:redis].zrange("instance:#{id}/#{item}",0,-1).map do |e|
-        [e,opts[:redis].get("instance:#{id}/#{item}/#{e}")]
+      opts[:redis].zrange(OBJ + ":#{id}/#{item}",0,-1).map do |e|
+        [e,opts[:redis].get(OBJ + ":#{id}/#{item}/#{e}")]
       end
     end #}}}
 
@@ -60,15 +62,32 @@ module CPEE
       )
     end #}}}
     def self::extract_item(id,opts,item) #{{{
-      opts[:redis].get("instance:#{id}/#{item}")
+      opts[:redis].get(OBJ + ":#{id}/#{item}")
     end #}}}
 
     def self::exists?(id,opts) #{{{
-      opts[:redis].exists?("instance:#{id}/state")
+      opts[:redis].exists?(OBJ + ":#{id}/state")
     end #}}}
+    def self::is_member?(id,opts,item,value) #{{{
+      opts[:redis].sismember(OBJ + ":#{id}/#{item}",value)
+    end  #}}}
+
+    def self::each_object(opts)
+      opts[:redis].zrevrange(OBJ + 's',0,-1).each do |instance|
+        yield instance
+      end
+    end
+
+    def self::new_object(opts)
+      opts[:redis].zrevrange(OBJ + 's', 0, 0).first.to_i + 1
+    end
+
+    def self::keys(id,opts,item=nil)
+      opts[:redis].keys(File.join(OBJ + ":#{id}",item.to_s,'*'))
+    end
 
     def self::set_handler(id,opts,key,url,values,update=false) #{{{
-      exis = opts[:redis].smembers("instance:#{id}/handlers/#{key}")
+      exis = opts[:redis].smembers(OBJ + ":#{id}/handlers/#{key}")
 
       if update == false && exis.length > 0
         return 405
@@ -101,14 +120,14 @@ module CPEE
       200
     end #}}}
     def self::extract_handler(id,opts,key) #{{{
-      opts[:redis].smembers("instance:#{id}/handlers/#{key}")
+      opts[:redis].smembers(OBJ + ":#{id}/handlers/#{key}")
     end #}}}
     def self::exists_handler?(id,opts,key) #{{{
-      opts[:redis].exists?("instance:#{id}/handlers/#{key}")
+      opts[:redis].exists?(OBJ + ":#{id}/handlers/#{key}")
     end #}}}
     def self::extract_handlers(id,opts) #{{{
-      opts[:redis].smembers("instance:#{id}/handlers").map do |e|
-        [e, opts[:redis].get("instance:#{id}/handlers/#{e}/url")]
+      opts[:redis].smembers(OBJ + ":#{id}/handlers").map do |e|
+        [e, opts[:redis].get(OBJ + ":#{id}/handlers/#{e}/url")]
       end
     end #}}}
   end

data/server/executionhandlers/ruby/connection.rb

@@ -15,6 +15,7 @@
 require 'charlock_holmes'
 require 'mimemagic'
 require 'base64'
+require 'get_process_mem'
 
 class ConnectionWrapper < WEEL::ConnectionWrapperBase
   def self::loop_guard(arguments,id,count) # {{{
@@ -77,7 +78,15 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
   end #}}}
 
   def additional #{{{
-    { :attributes => @controller.attributes }
+    {
+      :attributes => @controller.attributes,
+      :cpee => {
+        'base' => @controller.base_url,
+        'instance' => @controller.instance_id,
+        'instance_url' => @controller.instance_url,
+        'instance_uuid' => @controller.uuid
+      }
+    }
   end #}}}
 
   def proto_curl(parameters) #{{{
@@ -184,6 +193,7 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
 
   def inform_activity_done # {{{
     @controller.notify("activity/done", :'activity-uuid' => @handler_activity_uuid, :endpoint => @handler_endpoint, :label => @label, :activity => @handler_position)
+    @controller.notify("status/resource_utilization", :mib => GetProcessMem.new.mb, **Process.times.to_h)
   end # }}}
   def inform_activity_manipulate # {{{
     @controller.notify("activity/manipulating", :'activity-uuid' => @handler_activity_uuid, :endpoint => @handler_endpoint, :label => @label, :activity => @handler_position)
@@ -220,6 +230,8 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
       elsif result[0].is_a? Riddl::Parameter::Complex
         if result[0].mimetype == 'application/json'
           result = JSON::parse(result[0].value.read) rescue nil
+        elsif result[0].mimetype == 'text/yaml'
+          result = YAML::load(result[0].value.read) rescue nil
         elsif result[0].mimetype == 'application/xml' || result[0].mimetype == 'text/xml'
           result = XML::Smart::string(result[0].value.read) rescue nil
         elsif result[0].mimetype == 'text/plain'
@@ -301,10 +313,14 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
   end
 
   def callback(result=nil,options={})
-    @controller.notify("activity/receiving", :'activity-uuid' => @handler_activity_uuid, :label => @label, :activity => @handler_position, :endpoint => @handler_endpoint, :received => structurize_result(result), :annotations => @anno)
+    recv = structurize_result(result)
+    @controller.notify("activity/receiving", :'activity-uuid' => @handler_activity_uuid, :label => @label, :activity => @handler_position, :endpoint => @handler_endpoint, :received => recv, :annotations => @anno)
     @guard_files += result
     @handler_returnValue = simplify_result(result)
     @handler_returnOptions = options
+    if options['CPEE_EVENT']
+      @controller.notify("task/#{headers['CPEE_EVENT'].gsub(/[^\w_-]/,'')}", :'activity-uuid' => @handler_activity_uuid, :label => @label, :activity => @handler_position, :endpoint => @handler_endpoint, :received => recv)
+    end
     if options['CPEE_UPDATE']
       if options['CPEE_UPDATE_STATUS']
         @controller.notify("activity/status", :'activity-uuid' => @handler_activity_uuid, :label => @label, :activity => @handler_position, :endpoint => @handler_endpoint, :status => options['CPEE_UPDATE_STATUS'])

data/server/executionhandlers/ruby/controller.rb

@@ -21,6 +21,7 @@ require 'cpee/value_helper'
 require 'cpee/attributes_helper'
 require 'cpee/message'
 require 'cpee/redis'
+require 'cpee/persistence'
 
 require 'ostruct'
 class ParaStruct < OpenStruct
@@ -41,8 +42,8 @@ class Controller
     @id = id
 
     @attributes = {}
-    @redis.keys("instance:#{id}/attributes/*").each do |key|
-      @attributes[File.basename(key)] = @redis.get(key)
+    CPEE::Persistence::extract_list(id,opts,'attributes').each do |de|
+      @attributes[de[0]] = de[1]
     end
 
     @attributes_helper = AttributesHelper.new
@@ -52,9 +53,9 @@ class Controller
     @loop_guard = {}
 
     @callback_keys = {}
-    @psredis = @opts[:redis_dyn].call "Instance #{@id} Callback Response"
 
-    Thread.new do
+    @subs = Thread.new do
+      @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])
@@ -77,6 +78,10 @@ class Controller
           end
         end
       end
+      @psredis.close
+    rescue =>  e
+      sleep 1
+      retry
     end
   end
 
@@ -136,7 +141,6 @@ class Controller
         CPEE::Message::send(:'vote-response',key,base,@id,uuid,info,true,@redis)
       end
     end
-    @thread.join if !@thread.nil? && @thread.alive?
   end
 
   def info
@@ -152,7 +156,8 @@ class Controller
     topic, name = what.split('/')
     handler = File.join(topic,'vote',name)
     votes = []
-    @redis.smembers("instance:#{id}/handlers/#{handler}").each do |client|
+
+    CPEE::Persistence::extract_handler(id,@opts,handler).each do |client|
       voteid = Digest::MD5.hexdigest(Kernel::rand().to_s)
       content[:key] = voteid
       content[:attributes] = attributes_translated

data/server/executionhandlers/ruby/dsl_to_dslx.xsl

@@ -6,10 +6,10 @@
   <xsl:template match="/">
     <xsl:text>control flow do</xsl:text>
     <xsl:call-template name="print-newline"/>
-    <xsl:apply-templates select="//d:description"/>
+    <xsl:apply-templates select="/d:description"/>
     <xsl:text>end</xsl:text>
   </xsl:template>
-  <xsl:template match="//d:description">
+  <xsl:template match="/d:description">
     <xsl:apply-templates>
       <xsl:with-param name="myspace">
         <xsl:value-of select="0*$myspacemultiplier"/>
@@ -749,9 +749,9 @@
               <xsl:otherwise>
                 <xsl:choose>
                   <xsl:when test="substring(.,1,1) = '!'">
-                    <xsl:text>#{</xsl:text>
-                    <xsl:value-of select="str:replace(str:replace(substring(.,2),'\','\\'),'&quot;','\\\&quot;')"/>
-                    <xsl:text>.to_json}</xsl:text>
+                    <xsl:text>#{(</xsl:text>
+                    <xsl:value-of select="substring(.,2)"/>
+                    <xsl:text>).to_json}</xsl:text>
                   </xsl:when>
                   <xsl:otherwise>
                     <xsl:text>\"</xsl:text>

data/server/resources/topics.xml

@@ -41,6 +41,7 @@
     <vote>change</vote>
   </topic>
   <topic id='status'>
+    <event>resource_utilization</event>
     <event>change</event>
   </topic>
   <topic id='dataelements'>

data/server/routing/forward-events.rb

@@ -62,6 +62,12 @@ Daemonite.new do |opts|
             end
           end
         end
+        unless opts[:redis].exists?("instance:#{instance}/state")
+          empt = opts[:redis].keys("instance:#{instance}/*").to_a
+          opts[:redis].multi do |multi|
+            multi.del empt
+          end
+        end
       rescue => e
         puts e.message
         puts e.backtrace

data/server/routing/persist.rb

@@ -66,8 +66,10 @@ Daemonite.new do |opts|
             end
           when 'event:state/change'
             opts[:redis].multi do |multi|
-              multi.set("instance:#{instance}/state",mess.dig('content','state'))
-              multi.set("instance:#{instance}/state/@changed",mess.dig('timestamp'))
+              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'
             opts[:redis].set("instance:#{instance}/executionhandler",mess.dig('content','executionhandler'))

data/server/server.conf

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