Changeset 13985 in genesis for tools

Timestamp:

Sep 22, 2017, 6:32:52 PM (7 years ago)

Author:

www

Message:

Fix error print statements handled as headers when updating with an error.

This quirck is to make the code somehow more object consistent, we also could have moved the header statement, yet that is no fun...

File:

• tools/gformat.py (modified) (6 diffs)

tools/gformat.py

@@ -50 +50 @@
 import textwrap
 import time
+import traceback
 import urlparse
 
@@ -237 +238 @@
             datadump[key]['autogen_iface'] = '_'.join(key.split('_')[1:])
 
-    except Exception:
-      print "# Error while processing interface %s" % key
+    except Exception as exc:
+      exc.args = ("# Error while processing interface %s" % key,) + exc.args
       raise
 
@@ -250 +251 @@
     datadump['autogen_fqdn'] = datadump['nodename'] + '.' + datadump['autogen_domain']
     datadump_cache[item] = datadump.copy()
-  except Exception:
-    print "# Error while processing %s" % item
+  except Exception as exc:
+    exc.args = ("# Error while processing %s" % item,) + exc.args
     raise
   return datadump
@@ -1381 +1382 @@
           output += "  %-11s: %s\n" % (key, format_yaml_value(datadump[iface_key][key]))
       output += "\n\n"
-    except Exception:
-      print "# Error while processing interface %s" % iface_key
+    except Exception as exc:
+      exc.args = ("# Error while processing interface %s" % iface_key,) + exc.args
       raise
 
@@ -1494 +1495 @@
     output += subprocess.Popen([SVN, 'cleanup', "%s/.." % NODE_DIR], stderr=subprocess.STDOUT, stdout=subprocess.PIPE).communicate()[0]
     output += subprocess.Popen([SVN, 'up', "%s/.." % NODE_DIR], stderr=subprocess.STDOUT, stdout=subprocess.PIPE).communicate()[0]
-    generate_static(CACHE_DIR, False)
+    try:
+        generate_static(CACHE_DIR, False)
+    except:
+        output += traceback.format_exc()
+        pass
     output += "[INFO] All done, redirecting in 5 seconds"
     response_headers += [
@@ -2267 +2272 @@
                 datadump['monitoring_group'] = 'wleiden'
 
-            except Exception:
-              print "# Error while processing interface %s" % iface_key
+            except Exception as exc:
+              exc.args = ("# Error while processing interface %s" % iface_key,) + exc.args
               raise
           store_yaml(datadump)
-        except Exception:
-          print "# Error while processing %s" % host
+        except Exception as exc:
+          exc.args = ("# Error while processing %s" % host,) + exc.args
           raise
     elif sys.argv[1] == "list":