Add changes for f466d4b

Contribution/Development.html

@@ -181,7 +181,7 @@ <h1>MetPX-Sarracenia Developer’s Guide<a class="headerlink" href="#metpx-sarra
 <dd class="field-odd"><p>UNKNOWN</p>
 </dd>
 <dt class="field-even">date<span class="colon">:</span></dt>
-<dd class="field-even"><p>Jan 01, 2024</p>
+<dd class="field-even"><p>Jan 04, 2024</p>
 </dd>
 </dl>
 <section id="tools-you-need">

Contribution/Philosophy/AboutTime.ipynb

@@ -41,10 +41,10 @@
    "id": "703ed5c2",
    "metadata": {
     "execution": {
-     "iopub.execute_input": "2024-01-01T22:46:48.345342Z",
-     "iopub.status.busy": "2024-01-01T22:46:48.344761Z",
-     "iopub.status.idle": "2024-01-01T22:46:48.347132Z",
-     "shell.execute_reply": "2024-01-01T22:46:48.346759Z"
+     "iopub.execute_input": "2024-01-04T16:12:50.956171Z",
+     "iopub.status.busy": "2024-01-04T16:12:50.955726Z",
+     "iopub.status.idle": "2024-01-04T16:12:50.958284Z",
+     "shell.execute_reply": "2024-01-04T16:12:50.957973Z"
     }
    },
    "outputs": [],
@@ -67,10 +67,10 @@
    "id": "5c1a4040",
    "metadata": {
     "execution": {
-     "iopub.execute_input": "2024-01-01T22:46:48.349669Z",
-     "iopub.status.busy": "2024-01-01T22:46:48.349302Z",
-     "iopub.status.idle": "2024-01-01T22:46:48.350946Z",
-     "shell.execute_reply": "2024-01-01T22:46:48.351223Z"
+     "iopub.execute_input": "2024-01-04T16:12:50.960508Z",
+     "iopub.status.busy": "2024-01-04T16:12:50.959817Z",
+     "iopub.status.idle": "2024-01-04T16:12:50.962597Z",
+     "shell.execute_reply": "2024-01-04T16:12:50.962298Z"
     }
    },
    "outputs": [],

Contribution/man_page_template.html

@@ -131,7 +131,7 @@ <h2>sr_title<a class="headerlink" href="#sr-title" title="Link to this heading">
 <dd class="field-odd"><p>1</p>
 </dd>
 <dt class="field-even">Date<span class="colon">:</span></dt>
-<dd class="field-even"><p>Jan 01, 2024</p>
+<dd class="field-even"><p>Jan 04, 2024</p>
 </dd>
 <dt class="field-odd">Version<span class="colon">:</span></dt>
 <dd class="field-odd"><p>UNKNOWN</p>

Explanation/SarraPluginDev.html

@@ -151,7 +151,7 @@ <h3>Revision Record<a class="headerlink" href="#revision-record" title="Link to
 <dd class="field-odd"><p>UNKNOWN</p>
 </dd>
 <dt class="field-even">date<span class="colon">:</span></dt>
-<dd class="field-even"><p>Jan 01, 2024</p>
+<dd class="field-even"><p>Jan 04, 2024</p>
 </dd>
 </dl>
 </section>

How2Guides/source.html

@@ -145,7 +145,7 @@ <h3>Revision Record<a class="headerlink" href="#revision-record" title="Link to
 <dd class="field-odd"><p>UNKNOWN</p>
 </dd>
 <dt class="field-even">date<span class="colon">:</span></dt>
-<dd class="field-even"><p>Jan 01, 2024</p>
+<dd class="field-even"><p>Jan 04, 2024</p>
 </dd>
 </dl>
 <p>A Sarracenia data pump is a web (or sftp) server with notifications for subscribers

How2Guides/subscriber.html

@@ -143,7 +143,7 @@ <h3>Revision Record<a class="headerlink" href="#revision-record" title="Link to
 <dd class="field-odd"><p>UNKNOWN</p>
 </dd>
 <dt class="field-even">date<span class="colon">:</span></dt>
-<dd class="field-even"><p>Jan 01, 2024</p>
+<dd class="field-even"><p>Jan 04, 2024</p>
 </dd>
 </dl>
 </section>

Reference/sr3.1.html

@@ -130,7 +130,7 @@ <h2>sr3 Sarracenia CLI<a class="headerlink" href="#sr3-sarracenia-cli" title="Li
 <dd class="field-odd"><p>1</p>
 </dd>
 <dt class="field-even">Date<span class="colon">:</span></dt>
-<dd class="field-even"><p>Jan 01, 2024</p>
+<dd class="field-even"><p>Jan 04, 2024</p>
 </dd>
 <dt class="field-odd">Version<span class="colon">:</span></dt>
 <dd class="field-odd"><p>UNKNOWN</p>

Reference/sr3_cpump.1.html

@@ -127,7 +127,7 @@ <h2>sr_shovel in C<a class="headerlink" href="#sr-shovel-in-c" title="Link to th
 <dd class="field-odd"><p>1</p>
 </dd>
 <dt class="field-even">Date<span class="colon">:</span></dt>
-<dd class="field-even"><p>Jan 01, 2024</p>
+<dd class="field-even"><p>Jan 04, 2024</p>
 </dd>
 <dt class="field-odd">Version<span class="colon">:</span></dt>
 <dd class="field-odd"><p>UNKNOWN</p>

Reference/sr3_credentials.7.html

@@ -124,7 +124,7 @@ <h2>SR3 Credential File Format<a class="headerlink" href="#sr3-credential-file-f
 <dd class="field-odd"><p>7</p>
 </dd>
 <dt class="field-even">Date<span class="colon">:</span></dt>
-<dd class="field-even"><p>Jan 01, 2024</p>
+<dd class="field-even"><p>Jan 04, 2024</p>
 </dd>
 <dt class="field-odd">Version<span class="colon">:</span></dt>
 <dd class="field-odd"><p>UNKNOWN</p>

Reference/sr3_options.7.html

@@ -128,7 +128,7 @@ <h2>SR3 Configuration File Format<a class="headerlink" href="#sr3-configuration-
 <dd class="field-odd"><p>7</p>
 </dd>
 <dt class="field-even">Date<span class="colon">:</span></dt>
-<dd class="field-even"><p>Jan 01, 2024</p>
+<dd class="field-even"><p>Jan 04, 2024</p>
 </dd>
 <dt class="field-odd">Version<span class="colon">:</span></dt>
 <dd class="field-odd"><p>UNKNOWN</p>

Reference/sr3_post.1.html

@@ -128,7 +128,7 @@ <h2>Publish the Availability of Files<a class="headerlink" href="#publish-the-av
 <dd class="field-odd"><p>1</p>
 </dd>
 <dt class="field-even">Date<span class="colon">:</span></dt>
-<dd class="field-even"><p>Jan 01, 2024</p>
+<dd class="field-even"><p>Jan 04, 2024</p>
 </dd>
 <dt class="field-odd">Version<span class="colon">:</span></dt>
 <dd class="field-odd"><p>UNKNOWN</p>

Reference/sr_post.7.html

@@ -133,7 +133,7 @@ <h2>Sarracenia v03 Notification Message Format/Protocol<a class="headerlink" hre
 <dd class="field-odd"><p>7</p>
 </dd>
 <dt class="field-even">Date<span class="colon">:</span></dt>
-<dd class="field-even"><p>Jan 01, 2024</p>
+<dd class="field-even"><p>Jan 04, 2024</p>
 </dd>
 <dt class="field-odd">Version<span class="colon">:</span></dt>
 <dd class="field-odd"><p>UNKNOWN</p>

Tutorials/Install.html

@@ -134,7 +134,7 @@ <h2>Revision Record<a class="headerlink" href="#revision-record" title="Link to
 <dd class="field-odd"><p>UNKNOWN</p>
 </dd>
 <dt class="field-even">date<span class="colon">:</span></dt>
-<dd class="field-even"><p>Jan 01, 2024</p>
+<dd class="field-even"><p>Jan 04, 2024</p>
 </dd>
 </dl>
 </section>

_modules/sarracenia/flow.html

@@ -1750,11 +1750,19 @@ <h1>Source code for sarracenia.flow</h1><div class="highlight"><pre>
             <span class="c1"># assert new_inflight_path is set.</span>
 
             <span class="k">if</span> <span class="n">os</span><span class="o">.</span><span class="n">path</span><span class="o">.</span><span class="n">exists</span><span class="p">(</span><span class="n">msg</span><span class="p">[</span><span class="s1">&#39;new_inflight_path&#39;</span><span class="p">]):</span>
+
                 <span class="k">if</span> <span class="bp">self</span><span class="o">.</span><span class="n">o</span><span class="o">.</span><span class="n">inflight</span><span class="p">:</span>
+                    <span class="n">how_old</span> <span class="o">=</span> <span class="n">time</span><span class="o">.</span><span class="n">time</span><span class="p">()</span> <span class="o">-</span> <span class="n">os</span><span class="o">.</span><span class="n">path</span><span class="o">.</span><span class="n">getmtime</span><span class="p">(</span><span class="n">msg</span><span class="p">[</span><span class="s1">&#39;new_inflight_path&#39;</span><span class="p">])</span>
                     <span class="c1">#FIXME: if mtime &gt; 5 minutes, perhaps rm it, and continue? what if transfer crashed?</span>
-                    <span class="n">logger</span><span class="o">.</span><span class="n">warning</span><span class="p">(</span>
-                        <span class="s1">&#39;inflight file already exists. race condition, deferring transfer of </span><span class="si">%s</span><span class="s1">&#39;</span>
-                        <span class="o">%</span> <span class="n">msg</span><span class="p">[</span><span class="s1">&#39;new_path&#39;</span><span class="p">])</span>
+                    <span class="c1">#       Added this with fixed value, should it be a setting?</span>
+                    <span class="k">if</span> <span class="n">how_old</span> <span class="o">&gt;</span> <span class="mi">300</span><span class="p">:</span>
+                        <span class="n">os</span><span class="o">.</span><span class="n">unlink</span><span class="p">(</span> <span class="n">msg</span><span class="p">[</span><span class="s1">&#39;new_inflight_path&#39;</span><span class="p">]</span> <span class="p">)</span>
+                        <span class="n">logger</span><span class="o">.</span><span class="n">info</span><span class="p">(</span>
+                            <span class="sa">f</span><span class="s2">&quot;inflight file is </span><span class="si">{</span><span class="n">how_old</span><span class="si">}</span><span class="s2">s old. Removed previous attempt </span><span class="si">{</span><span class="n">msg</span><span class="p">[</span><span class="s1">&#39;new_path&#39;</span><span class="p">]</span><span class="si">}</span><span class="s2">&quot;</span> <span class="p">)</span>
+                    <span class="k">else</span><span class="p">:</span>
+                        <span class="n">logger</span><span class="o">.</span><span class="n">warning</span><span class="p">(</span>
+                            <span class="s1">&#39;inflight file already exists. race condition, deferring transfer of </span><span class="si">%s</span><span class="s1">&#39;</span>
+                            <span class="o">%</span> <span class="n">msg</span><span class="p">[</span><span class="s1">&#39;new_path&#39;</span><span class="p">])</span>
                     <span class="bp">self</span><span class="o">.</span><span class="n">worklist</span><span class="o">.</span><span class="n">failed</span><span class="o">.</span><span class="n">append</span><span class="p">(</span><span class="n">msg</span><span class="p">)</span>
                     <span class="k">continue</span>
                 <span class="c1"># overwriting existing file.</span>
@@ -2049,6 +2057,8 @@ <h1>Source code for sarracenia.flow</h1><div class="highlight"><pre>
                         <span class="bp">self</span><span class="o">.</span><span class="n">proto</span><span class="p">[</span><span class="bp">self</span><span class="o">.</span><span class="n">scheme</span><span class="p">]</span><span class="o">.</span><span class="n">update_file</span><span class="p">(</span><span class="n">new_inflight_path</span><span class="p">)</span>
             <span class="k">elif</span> <span class="n">len_written</span> <span class="o">&lt;</span> <span class="mi">0</span><span class="p">:</span>
                 <span class="n">logger</span><span class="o">.</span><span class="n">error</span><span class="p">(</span><span class="s2">&quot;failed to download </span><span class="si">%s</span><span class="s2">&quot;</span> <span class="o">%</span> <span class="n">new_file</span><span class="p">)</span>
+                <span class="k">if</span> <span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">o</span><span class="o">.</span><span class="n">inflight</span> <span class="o">!=</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">and</span> <span class="n">os</span><span class="o">.</span><span class="n">path</span><span class="o">.</span><span class="n">isfile</span><span class="p">(</span><span class="n">new_inflight_path</span><span class="p">):</span>
+                    <span class="n">os</span><span class="o">.</span><span class="n">remove</span><span class="p">(</span><span class="n">new_inflight_path</span><span class="p">)</span>
                 <span class="k">return</span> <span class="kc">False</span>
             <span class="k">else</span><span class="p">:</span>
                 <span class="k">if</span> <span class="n">block_length</span> <span class="o">==</span> <span class="mi">0</span><span class="p">:</span>
@@ -2070,6 +2080,8 @@ <h1>Source code for sarracenia.flow</h1><div class="highlight"><pre>
                             <span class="n">logger</span><span class="o">.</span><span class="n">error</span><span class="p">(</span> <span class="sa">f</span><span class="s1">&#39;download more </span><span class="si">{</span><span class="n">len_written</span><span class="si">}</span><span class="s1"> than expected </span><span class="si">{</span><span class="n">block_length</span><span class="si">}</span><span class="s1"> bytes for </span><span class="si">{</span><span class="n">new_inflight_path</span><span class="si">}</span><span class="s1">&#39;</span> <span class="p">)</span>
                         <span class="k">else</span><span class="p">:</span>
                             <span class="n">logger</span><span class="o">.</span><span class="n">error</span><span class="p">(</span> <span class="sa">f</span><span class="s1">&#39;incomplete download only </span><span class="si">{</span><span class="n">len_written</span><span class="si">}</span><span class="s1"> of expected </span><span class="si">{</span><span class="n">block_length</span><span class="si">}</span><span class="s1"> bytes for </span><span class="si">{</span><span class="n">new_inflight_path</span><span class="si">}</span><span class="s1">&#39;</span> <span class="p">)</span>
+                        <span class="k">if</span> <span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">o</span><span class="o">.</span><span class="n">inflight</span> <span class="o">!=</span> <span class="kc">None</span><span class="p">)</span> <span class="ow">and</span> <span class="n">os</span><span class="o">.</span><span class="n">path</span><span class="o">.</span><span class="n">isfile</span><span class="p">(</span><span class="n">new_inflight_path</span><span class="p">):</span>
+                            <span class="n">os</span><span class="o">.</span><span class="n">remove</span><span class="p">(</span><span class="n">new_inflight_path</span><span class="p">)</span>
                         <span class="k">return</span> <span class="kc">False</span>
                 <span class="c1"># when len_written is different than block_length</span>
                 <span class="n">msg</span><span class="p">[</span><span class="s1">&#39;size&#39;</span><span class="p">]</span> <span class="o">=</span> <span class="n">len_written</span>

fr/CommentFaire/source.html

@@ -144,7 +144,7 @@ <h3>Enregistrement de révision<a class="headerlink" href="#enregistrement-de-re
 <dd class="field-odd"><p>UNKNOWN</p>
 </dd>
 <dt class="field-even">date<span class="colon">:</span></dt>
-<dd class="field-even"><p>Jan 01, 2024</p>
+<dd class="field-even"><p>Jan 04, 2024</p>
 </dd>
 </dl>
 <p>Une pompe de données Sarracenia est un serveur Web (ou sftp) avec des notifications pour que les

fr/CommentFaire/subscriber.html

@@ -133,7 +133,7 @@ <h3>Enregistrement de révision<a class="headerlink" href="#enregistrement-de-re
 <dd class="field-odd"><p>UNKNOWN</p>
 </dd>
 <dt class="field-even">date<span class="colon">:</span></dt>
-<dd class="field-even"><p>Jan 01, 2024</p>
+<dd class="field-even"><p>Jan 04, 2024</p>
 </dd>
 </dl>
 </section>

fr/Contribution/Développement.html

@@ -142,7 +142,7 @@ <h1>Guide du développeur MetPX-Sarracenia<a class="headerlink" href="#guide-du-
 <dd class="field-odd"><p>UNKNOWN</p>
 </dd>
 <dt class="field-even">date<span class="colon">:</span></dt>
-<dd class="field-even"><p>Jan 01, 2024</p>
+<dd class="field-even"><p>Jan 04, 2024</p>
 </dd>
 </dl>
 <section id="outillage">

fr/Contribution/modèle_de_page_man.html

@@ -131,7 +131,7 @@ <h2>sr_titre<a class="headerlink" href="#sr-titre" title="Link to this heading">
 <dd class="field-odd"><p>1</p>
 </dd>
 <dt class="field-even">Date<span class="colon">:</span></dt>
-<dd class="field-even"><p>Jan 01, 2024</p>
+<dd class="field-even"><p>Jan 04, 2024</p>
 </dd>
 <dt class="field-odd">Version<span class="colon">:</span></dt>
 <dd class="field-odd"><p>UNKNOWN</p>

fr/Explication/SarraPluginDev.html

@@ -135,7 +135,7 @@ <h2>Travailler avec des plugins<a class="headerlink" href="#travailler-avec-des-
 <dd class="field-odd"><p>UNKNOWN</p>
 </dd>
 <dt class="field-even">date<span class="colon">:</span></dt>
-<dd class="field-even"><p>Jan 01, 2024</p>
+<dd class="field-even"><p>Jan 04, 2024</p>
 </dd>
 </dl>
 <section id="audience">

fr/Reference/sr3.1.html

@@ -127,7 +127,7 @@ <h2>sr3 Sarracenia CLI<a class="headerlink" href="#sr3-sarracenia-cli" title="Li
 <dd class="field-odd"><p>1</p>
 </dd>
 <dt class="field-even">Date<span class="colon">:</span></dt>
-<dd class="field-even"><p>Jan 01, 2024</p>
+<dd class="field-even"><p>Jan 04, 2024</p>
 </dd>
 <dt class="field-odd">Version<span class="colon">:</span></dt>
 <dd class="field-odd"><p>UNKNOWN</p>

fr/Reference/sr3_cpump.1.html

@@ -127,7 +127,7 @@ <h2>sr_shovel en C<a class="headerlink" href="#sr-shovel-en-c" title="Link to th
 <dd class="field-odd"><p>1</p>
 </dd>
 <dt class="field-even">Date<span class="colon">:</span></dt>
-<dd class="field-even"><p>Jan 01, 2024</p>
+<dd class="field-even"><p>Jan 04, 2024</p>
 </dd>
 <dt class="field-odd">Version<span class="colon">:</span></dt>
 <dd class="field-odd"><p>UNKNOWN</p>

fr/Reference/sr3_credentials.7.html

@@ -127,7 +127,7 @@ <h2>SR3 Credential: Format du Fichier<a class="headerlink" href="#sr3-credential
 <dd class="field-odd"><p>7</p>
 </dd>
 <dt class="field-even">Date<span class="colon">:</span></dt>
-<dd class="field-even"><p>Jan 01, 2024</p>
+<dd class="field-even"><p>Jan 04, 2024</p>
 </dd>
 <dt class="field-odd">Version<span class="colon">:</span></dt>
 <dd class="field-odd"><p>UNKNOWN</p>

fr/Reference/sr3_options.7.html

@@ -127,7 +127,7 @@ <h2>Format de fichier de configuration SR3<a class="headerlink" href="#format-de
 <dd class="field-odd"><p>7</p>
 </dd>
 <dt class="field-even">Date<span class="colon">:</span></dt>
-<dd class="field-even"><p>Jan 01, 2024</p>
+<dd class="field-even"><p>Jan 04, 2024</p>
 </dd>
 <dt class="field-odd">Version<span class="colon">:</span></dt>
 <dd class="field-odd"><p>UNKNOWN</p>

fr/Reference/sr3_post.1.html

@@ -127,7 +127,7 @@ <h2>Publie la Disponibilitée d’un fichier aux abonnés.<a class="headerlink"
 <dd class="field-odd"><p>1</p>
 </dd>
 <dt class="field-even">Date<span class="colon">:</span></dt>
-<dd class="field-even"><p>Jan 01, 2024</p>
+<dd class="field-even"><p>Jan 04, 2024</p>
 </dd>
 <dt class="field-odd">Version<span class="colon">:</span></dt>
 <dd class="field-odd"><p>UNKNOWN</p>

fr/Reference/sr_post.7.html

@@ -127,7 +127,7 @@ <h2>Format/Protocole de messages d’annonce Sarracenia<a class="headerlink" hre
 <dd class="field-odd"><p>7</p>
 </dd>
 <dt class="field-even">Date<span class="colon">:</span></dt>
-<dd class="field-even"><p>Jan 01, 2024</p>
+<dd class="field-even"><p>Jan 04, 2024</p>
 </dd>
 <dt class="field-odd">Version<span class="colon">:</span></dt>
 <dd class="field-odd"><p>UNKNOWN</p>

fr/Tutoriel/Installer.html

@@ -133,7 +133,7 @@ <h2>Enregistrement de révision<a class="headerlink" href="#enregistrement-de-re
 <dd class="field-odd"><p>UNKNOWN</p>
 </dd>
 <dt class="field-even">date<span class="colon">:</span></dt>
-<dd class="field-even"><p>Jan 01, 2024</p>
+<dd class="field-even"><p>Jan 04, 2024</p>
 </dd>
 </dl>
 </section>