Add changes for a3f30e2

Explanation/CommandLineGuide.html

@@ -835,9 +835,9 @@ <h3>Creating the Queue<a class="headerlink" href="#creating-the-queue" title="Li
 <p>Once connected to an AMQP broker, the user needs to create a queue.
 Common settings for the queue on broker :</p>
 <ul class="simple">
-<li><p><strong>queueShare &lt;strin&gt;         (default: ${USER}_${HOSTNAME}_${RAND8})</strong></p></li>
-<li><p><strong>expire        &lt;duration&gt;      (default: 5m  == five minutes. RECOMMEND OVERRIDING)</strong></p></li>
-<li><p><strong>message_ttl   &lt;duration&gt;      (default: None)</strong></p></li>
+<li><p><strong>queueShare    &lt;string&gt;       (default: ${USER}_${HOSTNAME}_${RAND8})</strong></p></li>
+<li><p><strong>expire        &lt;duration&gt;     (default: 5m  == five minutes. RECOMMEND OVERRIDING)</strong></p></li>
+<li><p><strong>message_ttl   &lt;duration&gt;     (default: None)</strong></p></li>
 <li><p><strong>prefetch      &lt;N&gt;            (default: 1)</strong></p></li>
 </ul>
 <p>Usually components guess reasonable defaults for all these values
@@ -1742,6 +1742,7 @@ <h2>Configurations<a class="headerlink" href="#configurations" title="Link to th
 <li><p>${CONFIG}      - the name of the configuration file being run.</p></li>
 <li><p>${HOSTNAME}    - the hostname running the client.</p></li>
 <li><p>${RANDID}      - a random id that will be consistent within a single invocation.</p></li>
+<li><p>${INSTANCE}    - The instance id of the running flow.</p></li>
 </ul>
 </div></blockquote>
 </section>

Reference/sr3_options.7.html

@@ -242,6 +242,7 @@ <h3>Variables<a class="headerlink" href="#variables" title="Link to this heading
 <li><p>HOSTNAME    - the hostname running the client.</p></li>
 <li><p>RANDID      - a random id (0-64Ki) that will be consistent within a single instance.</p></li>
 <li><p>RAND8       - a random 8 digit wide number that is generated whenever it is evaluated in a string.</p></li>
+<li><p>INSTANCE    - the flow process’s instance number</p></li>
 </ul>
 <p>The %Y%m%d and %h time stamps refer to the time at which the data is processed by
 the component, it is not decoded or derived from the content of the files delivered.

_modules/sarracenia/config.html

@@ -1170,6 +1170,12 @@ <h1>Source code for sarracenia.config</h1><div class="highlight"><pre>
         <span class="k">if</span> <span class="p">(</span> <span class="s1">&#39;$</span><span class="si">{RAND8}</span><span class="s1">&#39;</span> <span class="ow">in</span> <span class="n">word</span> <span class="p">):</span>
             <span class="n">result</span> <span class="o">=</span> <span class="n">result</span><span class="o">.</span><span class="n">replace</span><span class="p">(</span><span class="s1">&#39;$</span><span class="si">{RAND8}</span><span class="s1">&#39;</span><span class="p">,</span> <span class="nb">str</span><span class="p">(</span><span class="n">randint</span><span class="p">(</span><span class="mi">0</span><span class="p">,</span> <span class="mi">100000000</span><span class="p">))</span><span class="o">.</span><span class="n">zfill</span><span class="p">(</span><span class="mi">8</span><span class="p">))</span>
 
+        <span class="k">if</span> <span class="p">(</span> <span class="s1">&#39;$</span><span class="si">{INSTANCE}</span><span class="s1">&#39;</span> <span class="ow">in</span> <span class="n">word</span> <span class="p">):</span>
+            <span class="k">if</span> <span class="nb">hasattr</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span><span class="s1">&#39;no&#39;</span><span class="p">):</span> 
+                <span class="n">instance</span><span class="o">=</span><span class="bp">self</span><span class="o">.</span><span class="n">no</span>
+            <span class="k">else</span><span class="p">:</span>
+                <span class="n">instance</span><span class="o">=</span><span class="mi">00</span>
+            <span class="n">result</span> <span class="o">=</span> <span class="n">result</span><span class="o">.</span><span class="n">replace</span><span class="p">(</span><span class="s1">&#39;$</span><span class="si">{INSTANCE}</span><span class="s1">&#39;</span><span class="p">,</span> <span class="sa">f</span><span class="s2">&quot;</span><span class="si">{</span><span class="n">instance</span><span class="si">:</span><span class="s2">02d</span><span class="si">}</span><span class="s2">&quot;</span> <span class="p">)</span>
         <span class="k">if</span> <span class="ow">not</span> <span class="s1">&#39;$&#39;</span> <span class="ow">in</span> <span class="n">result</span><span class="p">:</span>
             <span class="k">return</span> <span class="n">result</span>
 
@@ -1190,6 +1196,8 @@ <h1>Source code for sarracenia.config</h1><div class="highlight"><pre>
                 <span class="n">repval</span> <span class="o">=</span> <span class="nb">getattr</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">e</span><span class="p">)</span>
                 <span class="k">if</span> <span class="nb">type</span><span class="p">(</span><span class="n">repval</span><span class="p">)</span> <span class="ow">is</span> <span class="nb">list</span><span class="p">:</span>
                     <span class="n">repval</span> <span class="o">=</span> <span class="n">repval</span><span class="p">[</span><span class="mi">0</span><span class="p">]</span>
+                <span class="k">if</span> <span class="nb">type</span><span class="p">(</span><span class="n">repval</span><span class="p">)</span> <span class="ow">is</span> <span class="ow">not</span> <span class="nb">str</span><span class="p">:</span>
+                    <span class="n">repval</span> <span class="o">=</span> <span class="nb">str</span><span class="p">(</span><span class="n">repval</span><span class="p">)</span>
                 <span class="n">result</span> <span class="o">=</span> <span class="n">result</span><span class="o">.</span><span class="n">replace</span><span class="p">(</span><span class="s1">&#39;${&#39;</span> <span class="o">+</span> <span class="n">E</span> <span class="o">+</span> <span class="s1">&#39;}&#39;</span><span class="p">,</span> <span class="n">repval</span><span class="p">)</span>
                 <span class="k">continue</span>
 

_sources/Explanation/CommandLineGuide.rst.txt

@@ -661,9 +661,9 @@ Creating the Queue
 Once connected to an AMQP broker, the user needs to create a queue.
 Common settings for the queue on broker :
 
-- **queueShare <strin>         (default: ${USER}_${HOSTNAME}_${RAND8})**
-- **expire        <duration>      (default: 5m  == five minutes. RECOMMEND OVERRIDING)**
-- **message_ttl   <duration>      (default: None)**
+- **queueShare    <string>       (default: ${USER}_${HOSTNAME}_${RAND8})**
+- **expire        <duration>     (default: 5m  == five minutes. RECOMMEND OVERRIDING)**
+- **message_ttl   <duration>     (default: None)**
 - **prefetch      <N>            (default: 1)**
 
 
@@ -1733,6 +1733,7 @@ right hand side to be evaluated, surrounded by ${..} The built-in variables are:
  - ${CONFIG}      - the name of the configuration file being run.
  - ${HOSTNAME}    - the hostname running the client.
  - ${RANDID}      - a random id that will be consistent within a single invocation.
+ - ${INSTANCE}    - The instance id of the running flow.
 
 
 flowCallbacks

_sources/Reference/sr3_options.7.rst.txt

@@ -142,6 +142,7 @@ option, with the use of *${..}* notation:
 * HOSTNAME    - the hostname running the client.
 * RANDID      - a random id (0-64Ki) that will be consistent within a single instance.
 * RAND8       - a random 8 digit wide number that is generated whenever it is evaluated in a string.
+* INSTANCE    - the flow process's instance number 
 
 The %Y%m%d and %h time stamps refer to the time at which the data is processed by
 the component, it is not decoded or derived from the content of the files delivered.

_sources/fr/Explication/GuideLigneDeCommande.rst.txt

@@ -1725,6 +1725,7 @@ right hand side to be evaluated, surrounded by ${..} The built-in variables are:
  - ${CONFIG}      - le nom du fichier de configuration en cours d'exécution.
  - ${HOSTNAME}    - le hostname qui exécute le client.
  - ${RANDID}      - Un ID aléatoire qui va être consistant pendant la duration d'une seule invocation.
+ - ${INSTANCE}    - le numéro d'instance du processus.
 
 flowCallbacks
 =============

_sources/fr/Reference/sr3_options.7.rst.txt

@@ -140,6 +140,7 @@ en utilisant la notation *${..} * :
 * HOSTNAME    - le hostname qui exécute le client.
 * RANDID      - Un ID aléatoire qui va être consistant pendant la duration d'une seule invocation.
 * RAND8 - un nombre aléatoire à 8 chiffres qui est généré chaque fois qu'il est évalué dans une chaîne de caractères.
+* INSTANCE   - le numéro d'instance du processus de flux (composant/configuration)
 
 
 Les horodatages %Y%m%d et %H font référence à l’heure à laquelle les données sont traitées par

fr/Explication/GuideLigneDeCommande.html

@@ -1695,6 +1695,7 @@ <h2>Configurations<a class="headerlink" href="#configurations" title="Link to th
 <li><p>${CONFIG}      - le nom du fichier de configuration en cours d’exécution.</p></li>
 <li><p>${HOSTNAME}    - le hostname qui exécute le client.</p></li>
 <li><p>${RANDID}      - Un ID aléatoire qui va être consistant pendant la duration d’une seule invocation.</p></li>
+<li><p>${INSTANCE}    - le numéro d’instance du processus.</p></li>
 </ul>
 </div></blockquote>
 </section>

fr/Reference/sr3_options.7.html

@@ -241,6 +241,7 @@ <h3>Variables<a class="headerlink" href="#variables" title="Link to this heading
 <li><p>HOSTNAME    - le hostname qui exécute le client.</p></li>
 <li><p>RANDID      - Un ID aléatoire qui va être consistant pendant la duration d’une seule invocation.</p></li>
 <li><p>RAND8 - un nombre aléatoire à 8 chiffres qui est généré chaque fois qu’il est évalué dans une chaîne de caractères.</p></li>
+<li><p>INSTANCE   - le numéro d’instance du processus de flux (composant/configuration)</p></li>
 </ul>
 <p>Les horodatages %Y%m%d et %H font référence à l’heure à laquelle les données sont traitées par
 le composant, ceci n’est pas décodé ou dérivé du contenu des fichiers livrés.