Add changes for 2a28e91

MetPX · Jun 6, 2024 · cc0eb41 · cc0eb41
1 parent e102d79
commit cc0eb41
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/_modules/sarracenia/flow.html b/_modules/sarracenia/flow.html
@@ -1088,10 +1088,20 @@ <h1>Source code for sarracenia.flow</h1><div class="highlight"><pre>
             <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">messageAgeMax</span> <span class="o">!=</span> <span class="mi">0</span> <span class="ow">and</span> <span class="n">lag</span> <span class="o">&gt;</span> <span class="bp">self</span><span class="o">.</span><span class="n">o</span><span class="o">.</span><span class="n">messageAgeMax</span><span class="p">:</span>
                 <span class="bp">self</span><span class="o">.</span><span class="n">reject</span><span class="p">(</span>
                     <span class="n">m</span><span class="p">,</span> <span class="mi">504</span><span class="p">,</span>
-                    <span class="s2">&quot;Excessive lag: </span><span class="si">%g</span><span class="s2"> sec. Skipping download of: </span><span class="si">%s</span><span class="s2">, &quot;</span> <span class="o">%</span>
-                    <span class="p">(</span><span class="n">lag</span><span class="p">,</span> <span class="n">m</span><span class="p">[</span><span class="s1">&#39;new_file&#39;</span><span class="p">]))</span>
+                    <span class="sa">f</span><span class="s2">&quot;message too old (high lag): </span><span class="si">{</span><span class="n">lag</span><span class="si">:</span><span class="s2">g</span><span class="si">}</span><span class="s2"> sec. skipping: </span><span class="si">{</span><span class="n">m</span><span class="p">[</span><span class="s1">&#39;new_file&#39;</span><span class="p">]</span><span class="si">}</span><span class="s2">, &quot;</span> <span class="p">)</span>
                 <span class="k">continue</span>
 
+            <span class="k">if</span> <span class="s1">&#39;mtime&#39;</span> <span class="ow">in</span> <span class="n">m</span><span class="p">:</span>
+                <span class="n">age</span> <span class="o">=</span>  <span class="n">now</span><span class="o">-</span><span class="n">sarracenia</span><span class="o">.</span><span class="n">timestr2flt</span><span class="p">(</span><span class="n">m</span><span class="p">[</span><span class="s1">&#39;mtime&#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">fileAgeMax</span> <span class="o">&gt;</span> <span class="mi">0</span> <span class="ow">and</span> <span class="n">age</span> <span class="o">&gt;</span> <span class="bp">self</span><span class="o">.</span><span class="n">o</span><span class="o">.</span><span class="n">fileAgeMax</span><span class="p">:</span>
+                    <span class="bp">self</span><span class="o">.</span><span class="n">reject</span><span class="p">(</span> <span class="n">m</span><span class="p">,</span> <span class="mi">410</span><span class="p">,</span> <span class="sa">f</span><span class="s2">&quot;file too old: </span><span class="si">{</span><span class="n">age</span><span class="si">:</span><span class="s2">g</span><span class="si">}</span><span class="s2"> sec. skipping: </span><span class="si">{</span><span class="n">m</span><span class="p">[</span><span class="s1">&#39;new_file&#39;</span><span class="p">]</span><span class="si">}</span><span class="s2">, &quot;</span><span class="p">)</span>
+                    <span class="k">continue</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">fileAgeMin</span> <span class="o">&gt;</span> <span class="mi">0</span> <span class="ow">and</span> <span class="n">age</span> <span class="o">&lt;</span> <span class="bp">self</span><span class="o">.</span><span class="n">o</span><span class="o">.</span><span class="n">fileAgeMin</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="sa">f</span><span class="s2">&quot;file too young: queueing for retry.&quot;</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="k">if</span> <span class="s1">&#39;fileOp&#39;</span> <span class="ow">in</span> <span class="n">m</span> <span class="ow">and</span> <span class="s1">&#39;rename&#39;</span> <span class="ow">in</span> <span class="n">m</span><span class="p">[</span><span class="s1">&#39;fileOp&#39;</span><span class="p">]:</span>
                 <span class="n">url</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">o</span><span class="o">.</span><span class="n">variableExpansion</span><span class="p">(</span><span class="n">m</span><span class="p">[</span><span class="s1">&#39;baseUrl&#39;</span><span class="p">],</span>
                                              <span class="n">m</span><span class="p">)</span> <span class="o">+</span> <span class="n">os</span><span class="o">.</span><span class="n">sep</span> <span class="o">+</span> <span class="n">m</span><span class="p">[</span><span class="s1">&#39;fileOp&#39;</span><span class="p">][</span><span class="s1">&#39;rename&#39;</span><span class="p">]</span>