cpee 2.1.104 → 2.1.108

data/server/executionhandlers/eval/dsl_to_dslx.xsl

@@ -110,6 +110,19 @@
         </xsl:with-param>
       </xsl:call-template>
       <xsl:text>terminate</xsl:text>
+      <xsl:choose>
+        <xsl:when test="@eid">
+          <xsl:text> :</xsl:text>
+          <xsl:value-of select="@eid"/>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:text> :e</xsl:text>
+          <xsl:for-each select="ancestor-or-self::*">
+            <xsl:text>_</xsl:text>
+            <xsl:value-of select="position()"/>
+          </xsl:for-each>
+        </xsl:otherwise>
+      </xsl:choose>
       <xsl:call-template name="print-newline"/>
     </xsl:if>
     <xsl:if test="name()='stop'">
@@ -145,6 +158,19 @@
         </xsl:with-param>
       </xsl:call-template>
       <xsl:text>escape</xsl:text>
+      <xsl:choose>
+        <xsl:when test="@eid">
+          <xsl:text> :</xsl:text>
+          <xsl:value-of select="@eid"/>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:text> :e</xsl:text>
+          <xsl:for-each select="ancestor-or-self::*">
+            <xsl:text>_</xsl:text>
+            <xsl:value-of select="position()"/>
+          </xsl:for-each>
+        </xsl:otherwise>
+      </xsl:choose>
       <xsl:call-template name="print-newline"/>
     </xsl:if>
     <xsl:if test="name()='parallel'">
@@ -155,8 +181,21 @@
         </xsl:with-param>
       </xsl:call-template>
       <xsl:text>parallel</xsl:text>
+      <xsl:choose>
+        <xsl:when test="@eid">
+          <xsl:text> :</xsl:text>
+          <xsl:value-of select="@eid"/>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:text> :e</xsl:text>
+          <xsl:for-each select="ancestor-or-self::*">
+            <xsl:text>_</xsl:text>
+            <xsl:value-of select="position()"/>
+          </xsl:for-each>
+        </xsl:otherwise>
+      </xsl:choose>
       <xsl:if test="@wait">
-        <xsl:text> :wait =&gt; </xsl:text>
+        <xsl:text>, :wait =&gt; </xsl:text>
         <xsl:value-of select="@wait"/>
         <xsl:if test="@cancel">
           <xsl:text>, :cancel =&gt; :</xsl:text>
@@ -186,16 +225,29 @@
           <xsl:value-of select="$myspace+$myspacemultiplier"/>
         </xsl:with-param>
       </xsl:call-template>
-      <xsl:text>loop </xsl:text>
+      <xsl:text>loop</xsl:text>
+      <xsl:choose>
+        <xsl:when test="@eid">
+          <xsl:text> :</xsl:text>
+          <xsl:value-of select="@eid"/>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:text> :e</xsl:text>
+          <xsl:for-each select="ancestor-or-self::*">
+            <xsl:text>_</xsl:text>
+            <xsl:value-of select="position()"/>
+          </xsl:for-each>
+        </xsl:otherwise>
+      </xsl:choose>
       <xsl:if test="@mode='pre_test'">
         <xsl:choose>
           <xsl:when test="@language='application/x-ruby'">
-            <xsl:text>pre_test{</xsl:text>
+            <xsl:text>, pre_test{</xsl:text>
             <xsl:value-of select="@condition"/>
             <xsl:text>} </xsl:text>
           </xsl:when>
           <xsl:otherwise>
-            <xsl:text>pre_test("</xsl:text>
+            <xsl:text>, pre_test("</xsl:text>
             <xsl:value-of select="str:replace(str:replace(@condition,'\','\\'),'&quot;','\&quot;')"/>
             <xsl:text>")</xsl:text>
           </xsl:otherwise>
@@ -204,12 +256,12 @@
       <xsl:if test="@mode='post_test'">
         <xsl:choose>
           <xsl:when test="@language='application/x-ruby'">
-            <xsl:text>post_test{</xsl:text>
+            <xsl:text>, post_test{</xsl:text>
             <xsl:value-of select="@condition"/>
             <xsl:text>} </xsl:text>
           </xsl:when>
           <xsl:otherwise>
-            <xsl:text>post_test("</xsl:text>
+            <xsl:text>, post_test("</xsl:text>
             <xsl:value-of select="str:replace(str:replace(@condition,'\','\\'),'&quot;','\&quot;')"/>
             <xsl:text>")</xsl:text>
           </xsl:otherwise>
@@ -306,13 +358,26 @@
           <xsl:value-of select="$myspace+$myspacemultiplier"/>
         </xsl:with-param>
       </xsl:call-template>
-      <xsl:text>choose </xsl:text>
+      <xsl:text>choose</xsl:text>
+      <xsl:choose>
+        <xsl:when test="@eid">
+          <xsl:text> :</xsl:text>
+          <xsl:value-of select="@eid"/>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:text> :e</xsl:text>
+          <xsl:for-each select="ancestor-or-self::*">
+            <xsl:text>_</xsl:text>
+            <xsl:value-of select="position()"/>
+          </xsl:for-each>
+        </xsl:otherwise>
+      </xsl:choose>
       <xsl:choose>
         <xsl:when test="@mode='exclusive'">
-          <xsl:text>:exclusive</xsl:text>
+          <xsl:text>, :exclusive</xsl:text>
         </xsl:when>
         <xsl:otherwise>
-          <xsl:text>:inclusive</xsl:text>
+          <xsl:text>, :inclusive</xsl:text>
         </xsl:otherwise>
       </xsl:choose>
       <xsl:text> do</xsl:text>
@@ -346,7 +411,21 @@
           <xsl:value-of select="$myspace+$myspacemultiplier"/>
         </xsl:with-param>
       </xsl:call-template>
-      <xsl:text>critical :</xsl:text>
+      <xsl:text>critical</xsl:text>
+      <xsl:choose>
+        <xsl:when test="@eid">
+          <xsl:text> :</xsl:text>
+          <xsl:value-of select="@eid"/>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:text> :e</xsl:text>
+          <xsl:for-each select="ancestor-or-self::*">
+            <xsl:text>_</xsl:text>
+            <xsl:value-of select="position()"/>
+          </xsl:for-each>
+        </xsl:otherwise>
+      </xsl:choose>
+      <xsl:text>, :</xsl:text>
       <xsl:value-of select="@sid"/>
       <xsl:text> do</xsl:text>
       <xsl:call-template name="print-newline"/>
@@ -373,15 +452,28 @@
         <xsl:value-of select="$myspace+$myspacemultiplier"/>
       </xsl:with-param>
     </xsl:call-template>
-    <xsl:text>alternative </xsl:text>
+    <xsl:text>alternative</xsl:text>
+    <xsl:choose>
+      <xsl:when test="@eid">
+        <xsl:text> :</xsl:text>
+        <xsl:value-of select="@eid"/>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:text> :e</xsl:text>
+        <xsl:for-each select="ancestor-or-self::*">
+          <xsl:text>_</xsl:text>
+          <xsl:value-of select="position()"/>
+        </xsl:for-each>
+      </xsl:otherwise>
+    </xsl:choose>
     <xsl:choose>
       <xsl:when test="@language='application/x-ruby'">
-        <xsl:text>test{</xsl:text>
+        <xsl:text>, test{</xsl:text>
         <xsl:value-of select="@condition"/>
         <xsl:text>}</xsl:text>
       </xsl:when>
       <xsl:otherwise>
-        <xsl:text>test("</xsl:text>
+        <xsl:text>, test("</xsl:text>
         <xsl:value-of select="str:replace(str:replace(@condition,'\','\\'),'&quot;','\&quot;')"/>
         <xsl:text>")</xsl:text>
       </xsl:otherwise>
@@ -418,7 +510,20 @@
           <xsl:value-of select="$myspace+$myspacemultiplier"/>
         </xsl:with-param>
       </xsl:call-template>
-      <xsl:text>otherwise </xsl:text>
+      <xsl:text>otherwise</xsl:text>
+      <xsl:choose>
+        <xsl:when test="@eid">
+          <xsl:text> :</xsl:text>
+          <xsl:value-of select="@eid"/>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:text> :e</xsl:text>
+          <xsl:for-each select="ancestor-or-self::*">
+            <xsl:text>_</xsl:text>
+            <xsl:value-of select="position()"/>
+          </xsl:for-each>
+        </xsl:otherwise>
+      </xsl:choose>
       <xsl:for-each select="@*[not(name()='language' or name()='condition' or name()='svg-label')]">
         <xsl:if test="position() &gt;1">, </xsl:if>
         <xsl:text>:</xsl:text>
@@ -452,7 +557,21 @@
         <xsl:value-of select="$myspace+$myspacemultiplier"/>
       </xsl:with-param>
     </xsl:call-template>
-    <xsl:text>parallel_branch do |local|</xsl:text>
+    <xsl:text>parallel_branch</xsl:text>
+    <xsl:choose>
+      <xsl:when test="@eid">
+        <xsl:text> :</xsl:text>
+        <xsl:value-of select="@eid"/>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:text> :e</xsl:text>
+        <xsl:for-each select="ancestor-or-self::*">
+          <xsl:text>_</xsl:text>
+          <xsl:value-of select="position()"/>
+        </xsl:for-each>
+      </xsl:otherwise>
+    </xsl:choose>
+    <xsl:text> do |local|</xsl:text>
     <xsl:call-template name="print-newline"/>
     <xsl:apply-templates>
       <xsl:with-param name="myspace">
@@ -494,7 +613,6 @@
     <xsl:text>:</xsl:text>
     <xsl:value-of select="name()"/>
     <xsl:text> =&gt; </xsl:text>
-
     <xsl:choose>
       <xsl:when test="count(*) &gt; 0 and name()='arguments'">
         <xsl:text>[</xsl:text>

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/connection.rb

@@ -60,7 +60,7 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
   end # }}}
   def self::inform_activity_minimal(arguments,what,uuid,label,position) # {{{
     controller = arguments[0]
-    controller.notify("activity/#{what}", :ecid => Thread.current.__id__, :'activity-uuid' => uuid, :label => label, :activity => position)
+    controller.notify("activity/#{what}", :'activity-uuid' => uuid, :label => label, :activity => position)
   end # }}}
 
   def initialize(arguments,position=nil,continue=nil) # {{{
@@ -201,10 +201,10 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
         callback result, headers
       elsif headers['CPEE_CALLBACK'] && headers['CPEE_CALLBACK'] == 'true' && result.empty?
         if headers['CPEE_INSTANTIATION']
-          @controller.notify("task/instantiation", :ecid => Thread.current.__id__, :'activity-uuid' => @handler_activity_uuid, :label => @label, :activity => @handler_position, :endpoint => @handler_endpoint, :received => CPEE::ValueHelper.parse(headers['CPEE_INSTANTIATION']))
+          @controller.notify("task/instantiation", :'activity-uuid' => @handler_activity_uuid, :label => @label, :activity => @handler_position, :endpoint => @handler_endpoint, :received => CPEE::ValueHelper.parse(headers['CPEE_INSTANTIATION']))
         end
         if headers['CPEE_EVENT']
-          @controller.notify("task/#{headers['CPEE_EVENT'].gsub(/[^\w_-]/,'')}", :ecid => Thread.current.__id__, :'activity-uuid' => @handler_activity_uuid, :label => @label, :activity => @handler_position, :endpoint => @handler_endpoint)
+          @controller.notify("task/#{headers['CPEE_EVENT'].gsub(/[^\w_-]/,'')}", :'activity-uuid' => @handler_activity_uuid, :label => @label, :activity => @handler_position, :endpoint => @handler_endpoint)
         end
         # do nothing, later on things will happend
       else
@@ -217,8 +217,8 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
     raise "Wrong endpoint" if @handler_endpoint.nil? || @handler_endpoint.empty?
     @label = parameters[:label]
     @anno = parameters.delete(:annotations) rescue nil
-    @controller.notify("activity/calling", :ecid => Thread.current.__id__, :'activity-uuid' => @handler_activity_uuid, :label => @label, :activity => @handler_position, :passthrough => passthrough, :endpoint => @handler_endpoint, :parameters => parameters)
-    @controller.notify("activity/annotation", :ecid => Thread.current.__id__, :'activity-uuid' => @handler_activity_uuid, :label => @label, :activity => @handler_position, :annotations => @anno)
+    @controller.notify("activity/calling", :'activity-uuid' => @handler_activity_uuid, :label => @label, :activity => @handler_position, :passthrough => passthrough, :endpoint => @handler_endpoint, :parameters => parameters)
+    @controller.notify("activity/annotation", :'activity-uuid' => @handler_activity_uuid, :label => @label, :activity => @handler_position, :annotations => @anno)
     if passthrough.to_s.empty?
       proto_curl parameters
     else
@@ -229,7 +229,7 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
   def activity_manipulate_handle(parameters) #{{{
     @label = parameters[:label]
     @anno = parameters.delete(:annotations) rescue nil
-    @controller.notify("activity/annotation", :ecid => Thread.current.__id__, :'activity-uuid' => @handler_activity_uuid, :label => @label, :activity => @handler_position, :annotations => @anno)
+    @controller.notify("activity/annotation", :'activity-uuid' => @handler_activity_uuid, :label => @label, :activity => @handler_position, :annotations => @anno)
   end #}}}
 
   def activity_stop # {{{
@@ -250,17 +250,17 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
   end #}}}
 
   def inform_activity_done # {{{
-    @controller.notify("activity/done", :ecid => Thread.current.__id__, :'activity-uuid' => @handler_activity_uuid, :endpoint => @handler_endpoint, :label => @label, :activity => @handler_position)
+    @controller.notify("activity/done", :'activity-uuid' => @handler_activity_uuid, :endpoint => @handler_endpoint, :label => @label, :activity => @handler_position)
   end # }}}
   def inform_activity_manipulate # {{{
-    @controller.notify("activity/manipulating", :ecid => Thread.current.__id__, :'activity-uuid' => @handler_activity_uuid, :endpoint => @handler_endpoint, :label => @label, :activity => @handler_position)
+    @controller.notify("activity/manipulating", :'activity-uuid' => @handler_activity_uuid, :endpoint => @handler_endpoint, :label => @label, :activity => @handler_position)
   end # }}}
   def inform_activity_failed(err) # {{{
-    @controller.notify("activity/failed", :ecid => Thread.current.__id__, :'activity-uuid' => @handler_activity_uuid, :endpoint => @handler_endpoint, :label => @label, :activity => @handler_position, :message => err.backtrace[0].match(/(.*?):(\d+):\s(.*)/)[3], :line => err.backtrace[0].match(/(.*?):(\d+):/)[2], :where => err.backtrace[0].match(/(.*?):(\d+):/)[1])
+    @controller.notify("activity/failed", :'activity-uuid' => @handler_activity_uuid, :endpoint => @handler_endpoint, :label => @label, :activity => @handler_position, :message => err.backtrace[0].match(/(.*?):(\d+):\s(.*)/)[3], :line => err.backtrace[0].match(/(.*?):(\d+):/)[2], :where => err.backtrace[0].match(/(.*?):(\d+):/)[1])
   end # }}}
   def inform_manipulate_change(status,changed_dataelements,changed_endpoints,dataelements,endpoints) # {{{
     unless status.nil?
-      @controller.notify("status/change", :ecid => Thread.current.__id__, :'activity-uuid' => @handler_activity_uuid, :endpoint => @handler_endpoint, :label => @label, :activity => @handler_position, :data => { :id => status.id, :message => status.message } )
+      @controller.notify("status/change", :'activity-uuid' => @handler_activity_uuid, :endpoint => @handler_endpoint, :label => @label, :activity => @handler_position, :data => { :id => status.id, :message => status.message } )
     end
     unless changed_dataelements.nil? || changed_dataelements.empty?
       de = dataelements.slice(*changed_dataelements).transform_values { |v| enc = CPEE::EvalRuby::Translation::detect_encoding(v); (enc == 'OTHER' ? v : (v.encode('UTF-8',enc) rescue CPEE::EvalRuby::Translation::convert_to_base64(v))) }
@@ -286,19 +286,19 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
       nil
     end
 
-    @controller.notify("activity/receiving", :ecid => Thread.current.__id__, :'activity-uuid' => @handler_activity_uuid, :label => @label, :activity => @handler_position, :endpoint => @handler_endpoint, :received => recv)
+    @controller.notify("activity/receiving", :'activity-uuid' => @handler_activity_uuid, :label => @label, :activity => @handler_position, :endpoint => @handler_endpoint, :received => recv)
 
     @guard_files += result
     @guard_files += ret
 
     if options['CPEE_INSTANTIATION']
-      @controller.notify("task/instantiation", :ecid => Thread.current.__id__, :'activity-uuid' => @handler_activity_uuid, :label => @label, :activity => @handler_position, :endpoint => @handler_endpoint, :received => CPEE::ValueHelper.parse(options['CPEE_INSTANTIATION']))
+      @controller.notify("task/instantiation", :'activity-uuid' => @handler_activity_uuid, :label => @label, :activity => @handler_position, :endpoint => @handler_endpoint, :received => CPEE::ValueHelper.parse(options['CPEE_INSTANTIATION']))
     end
     if options['CPEE_EVENT']
-      @controller.notify("task/#{options['CPEE_EVENT'].gsub(/[^\w_-]/,'')}", :ecid => Thread.current.__id__, :'activity-uuid' => @handler_activity_uuid, :label => @label, :activity => @handler_position, :endpoint => @handler_endpoint, :received => recv)
+      @controller.notify("task/#{options['CPEE_EVENT'].gsub(/[^\w_-]/,'')}", :'activity-uuid' => @handler_activity_uuid, :label => @label, :activity => @handler_position, :endpoint => @handler_endpoint, :received => recv)
     end
     if options['CPEE_STATUS']
-      @controller.notify("activity/status", :ecid => Thread.current.__id__, :'activity-uuid' => @handler_activity_uuid, :label => @label, :activity => @handler_position, :endpoint => @handler_endpoint, :status => options['CPEE_STATUS'])
+      @controller.notify("activity/status", :'activity-uuid' => @handler_activity_uuid, :label => @label, :activity => @handler_position, :endpoint => @handler_endpoint, :status => options['CPEE_STATUS'])
     end
 
     if options['CPEE_STATUS'] || options['CPEE_EVENT']
@@ -404,7 +404,7 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
     end
     params
   end #}}}
-  def test_condition(dataelements,endpoints,local,additional,code,args={}) #{{{
+  def test_condition(eid,dataelements,endpoints,local,additional,code,args={}) #{{{
     send = []
     send.push Riddl::Parameter::Simple::new('code',code)
     send.push Riddl::Parameter::Complex::new('dataelements','application/json', JSON::generate(dataelements))
@@ -421,8 +421,8 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
     recv = 'false' unless recv
     recv = (recv == 'false' || recv == 'null' || recv == 'nil' || recv == false ? false : true)
 
-    @controller.notify("gateway/decide", :ecid => Thread.current.__id__, :instance_uuid => @controller.uuid, :code => code, :condition => recv)
-    @controller.notify("gateway/annotation", :ecid => Thread.current.__id__, :'activity-uuid' => @handler_activity_uuid, :label => @label, :activity => @handler_position, :annotations => {})
+    @controller.notify("gateway/decide", :eid => eid, :instance_uuid => @controller.uuid, :code => code, :condition => recv)
+    @controller.notify("gateway/annotation", :eid => eid, :'activity-uuid' => @handler_activity_uuid, :label => @label, :activity => @handler_position, :annotations => {})
     recv
   end #}}}
   def manipulate(readonly,lock,dataelements,endpoints,status,local,additional,code,where,result=nil,options=nil) #{{{
@@ -461,13 +461,13 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
     end
   end #}}}
 
-  def split_branches(id, branches = []) # factual, so for inclusive or [[a],[b],[c,d,e]] {{{
-    payload = { :instance_uuid => @controller.uuid, :ecid => id.to_s }
+  def split_branches(eid, branches = []) # factual, so for inclusive or [[a],[b],[c,d,e]] {{{
+    payload = { :instance_uuid => @controller.uuid, :eid => eid.to_s }
     payload[:branches] = branches.length if branches.length > 0
     @controller.notify("gateway/split", payload )
   end #}}}
-  def join_branches(id, branches = []) # factual, so for inclusive or [[a],[b],[c,d,e]] {{{
-    payload = { :instance_uuid => @controller.uuid, :ecid => id.to_s }
+  def join_branches(eid, branches = []) # factual, so for inclusive or [[a],[b],[c,d,e]] {{{
+    payload = { :instance_uuid => @controller.uuid, :eid => eid.to_s }
     payload[:branches] = branches if branches.length > 0
     payload[:branches_length] = branches.length if branches.length > 0
     @controller.notify("gateway/join", payload )