Add changes for f983ae5

MetPX · Jun 6, 2024 · 3de83ed · 3de83ed
1 parent 3487661
commit 3de83ed
Showing 1 changed file with 28 additions and 4 deletions.
diff --git a/_modules/sarracenia/flow.html b/_modules/sarracenia/flow.html
@@ -852,7 +852,16 @@ <h1>Source code for sarracenia.flow</h1><div class="highlight"><pre>
                 <span class="k">for</span> <span class="n">dfm</span> <span class="ow">in</span> <span class="bp">self</span><span class="o">.</span><span class="n">plugins</span><span class="p">[</span><span class="s1">&#39;destfn&#39;</span><span class="p">]:</span>
                     <span class="n">classname</span> <span class="o">=</span>  <span class="n">dfm</span><span class="o">.</span><span class="vm">__qualname__</span><span class="o">.</span><span class="n">split</span><span class="p">(</span><span class="s1">&#39;.&#39;</span><span class="p">)[</span><span class="mi">0</span><span class="p">]</span>
                     <span class="k">if</span> <span class="p">(</span><span class="n">scriptclass</span> <span class="o">==</span> <span class="n">classname</span><span class="p">)</span> <span class="ow">or</span> <span class="p">(</span><span class="n">scriptclass</span><span class="o">.</span><span class="n">capitalize</span><span class="p">()</span> <span class="o">==</span> <span class="n">classname</span><span class="p">):</span> 
-                         <span class="n">destFileName</span> <span class="o">=</span> <span class="n">dfm</span><span class="p">(</span><span class="n">msg</span><span class="p">)</span>
+                        <span class="k">try</span><span class="p">:</span>
+                            <span class="n">destFileName</span> <span class="o">=</span> <span class="n">dfm</span><span class="p">(</span><span class="n">msg</span><span class="p">)</span>
+                        <span class="k">except</span> <span class="ne">Exception</span> <span class="k">as</span> <span class="n">ex</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;DESTFNSCRIPT plugin </span><span class="si">{</span><span class="n">dfm</span><span class="si">}</span><span class="s1"> crashed: </span><span class="si">{</span><span class="n">ex</span><span class="si">}</span><span class="s1">&#39;</span> <span class="p">)</span>
+                            <span class="n">logger</span><span class="o">.</span><span class="n">debug</span><span class="p">(</span> <span class="s2">&quot;details:&quot;</span><span class="p">,</span> <span class="n">exc_info</span><span class="o">=</span><span class="kc">True</span> <span class="p">)</span>
+
+                        <span class="k">if</span> <span class="n">destFileName</span> <span class="o">==</span> <span class="kc">None</span> <span class="ow">or</span> <span class="nb">type</span><span class="p">(</span><span class="n">destFileName</span><span class="p">)</span> <span class="o">!=</span> <span class="nb">str</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="s2">&quot;DESTFNSCRIPT </span><span class="si">{</span><span class="n">dfm</span><span class="si">}</span><span class="s2"> return value must be the new file name as a string. This one returned </span><span class="si">{</span><span class="n">destFileName</span><span class="si">}</span><span class="s2">, ignoring&quot;</span><span class="p">)</span>
+                             <span class="k">return</span> <span class="kc">None</span>
+
             <span class="k">elif</span> <span class="n">spec</span> <span class="o">==</span> <span class="s1">&#39;TIME&#39;</span><span class="p">:</span>
                 <span class="n">timeSuffix</span> <span class="o">=</span> <span class="s1">&#39;:&#39;</span> <span class="o">+</span> <span class="n">time</span><span class="o">.</span><span class="n">strftime</span><span class="p">(</span><span class="s2">&quot;%Y%m</span><span class="si">%d</span><span class="s2">%H%M%S&quot;</span><span class="p">,</span> <span class="n">time</span><span class="o">.</span><span class="n">gmtime</span><span class="p">())</span>
                 <span class="k">if</span> <span class="s1">&#39;pubTime&#39;</span> <span class="ow">in</span> <span class="n">msg</span><span class="p">:</span>
@@ -866,9 +875,8 @@ <h1>Source code for sarracenia.flow</h1><div class="highlight"><pre>
                     <span class="n">timeSuffix</span> <span class="o">=</span> <span class="s1">&#39;:&#39;</span> <span class="o">+</span> <span class="n">parts</span><span class="p">[</span><span class="o">-</span><span class="mi">1</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="s2">&quot;Don&#39;t understand this DESTFN parameter: </span><span class="si">%s</span><span class="s2">&quot;</span> <span class="o">%</span>
-                             <span class="n">spec</span><span class="p">)</span>
-                <span class="k">return</span> <span class="n">filename</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="s2">&quot;invalid DESTFN parameter: </span><span class="si">{</span><span class="n">spec</span><span class="si">}</span><span class="s2">&quot;</span> <span class="p">)</span>
+                <span class="k">return</span> <span class="kc">None</span>
         <span class="k">return</span> <span class="n">destFileName</span> <span class="o">+</span> <span class="n">satnet</span> <span class="o">+</span> <span class="n">timeSuffix</span></div>
 
 
@@ -1776,6 +1784,14 @@ <h1>Source code for sarracenia.flow</h1><div class="highlight"><pre>
                 <span class="bp">self</span><span class="o">.</span><span class="n">worklist</span><span class="o">.</span><span class="n">ok</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="ow">not</span> <span class="s1">&#39;new_dir&#39;</span> <span class="ow">in</span> <span class="n">msg</span> <span class="ow">or</span> <span class="ow">not</span> <span class="n">msg</span><span class="p">[</span><span class="s1">&#39;new_dir&#39;</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">msg</span><span class="p">,</span> <span class="mi">422</span><span class="p">,</span> <span class="sa">f</span><span class="s2">&quot;new_dir message field missing, do not know which directory to put file in. skipping.&quot;</span> <span class="p">)</span>
+                <span class="k">continue</span>
+
+            <span class="k">if</span> <span class="ow">not</span> <span class="s1">&#39;new_file&#39;</span> <span class="ow">in</span> <span class="n">msg</span> <span class="ow">or</span> <span class="ow">not</span> <span class="n">msg</span><span class="p">[</span><span class="s1">&#39;new_file&#39;</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">msg</span><span class="p">,</span> <span class="mi">422</span><span class="p">,</span> <span class="sa">f</span><span class="s2">&quot;new_file message field missing, do not know name of file to write. skipping.&quot;</span> <span class="p">)</span>
+                <span class="k">continue</span>
+
             <span class="n">new_path</span> <span class="o">=</span> <span class="n">msg</span><span class="p">[</span><span class="s1">&#39;new_dir&#39;</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">sep</span> <span class="o">+</span> <span class="n">msg</span><span class="p">[</span><span class="s1">&#39;new_file&#39;</span><span class="p">]</span>
             <span class="n">new_file</span> <span class="o">=</span> <span class="n">msg</span><span class="p">[</span><span class="s1">&#39;new_file&#39;</span><span class="p">]</span>
 
@@ -2878,6 +2894,14 @@ <h1>Source code for sarracenia.flow</h1><div class="highlight"><pre>
 
         <span class="k">for</span> <span class="n">msg</span> <span class="ow">in</span> <span class="bp">self</span><span class="o">.</span><span class="n">worklist</span><span class="o">.</span><span class="n">incoming</span><span class="p">:</span>
 
+            <span class="k">if</span> <span class="ow">not</span> <span class="s1">&#39;new_dir&#39;</span> <span class="ow">in</span> <span class="n">msg</span> <span class="ow">or</span> <span class="ow">not</span> <span class="n">msg</span><span class="p">[</span><span class="s1">&#39;new_dir&#39;</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">msg</span><span class="p">,</span> <span class="mi">422</span><span class="p">,</span> <span class="sa">f</span><span class="s2">&quot;new_dir message field missing, do not know which directory to put file in. skipping.&quot;</span> <span class="p">)</span>
+                <span class="k">continue</span>
+
+            <span class="k">if</span> <span class="ow">not</span> <span class="s1">&#39;new_file&#39;</span> <span class="ow">in</span> <span class="n">msg</span> <span class="ow">or</span> <span class="ow">not</span> <span class="n">msg</span><span class="p">[</span><span class="s1">&#39;new_file&#39;</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">msg</span><span class="p">,</span> <span class="mi">422</span><span class="p">,</span> <span class="sa">f</span><span class="s2">&quot;new_file message field missing, do not know name of file to write. skipping.&quot;</span> <span class="p">)</span>
+                <span class="k">continue</span>
+
             <span class="c1"># weed out non-file transfer operations that are configured to not be done.</span>
             <span class="k">if</span> <span class="s1">&#39;fileOp&#39;</span> <span class="ow">in</span> <span class="n">msg</span><span class="p">:</span>
                 <span class="k">if</span> <span class="p">(</span><span class="s1">&#39;directory&#39;</span> <span class="ow">in</span> <span class="n">msg</span><span class="p">[</span><span class="s1">&#39;fileOp&#39;</span><span class="p">])</span> <span class="ow">and</span> <span class="p">(</span><span class="s1">&#39;remove&#39;</span> <span class="ow">in</span> <span class="n">msg</span><span class="p">[</span><span class="s1">&#39;fileOp&#39;</span><span class="p">])</span> <span class="ow">and</span> <span class="p">(</span> <span class="s1">&#39;rmdir&#39;</span> <span class="ow">not</span> <span class="ow">in</span> <span class="bp">self</span><span class="o">.</span><span class="n">o</span><span class="o">.</span><span class="n">fileEvents</span> <span class="p">):</span>