]> git.puffer.fish Git - matthieu/frr.git/commit
tools: quagga-reload should raise Exception instead of exiting
authorDaniel Walton <dwalton@cumulusnetworks.com>
Tue, 27 Sep 2016 15:56:36 +0000 (15:56 +0000)
committerDaniel Walton <dwalton@cumulusnetworks.com>
Tue, 27 Sep 2016 16:00:47 +0000 (16:00 +0000)
commit8d62b1417ee85862a85454f635168e5e3fcf682d
tree587aa53c9851dde9b726e299fdebe84a9d454931
parentb6df4090322446a2ee32fc5e2d43d074d34a8f1f
tools: quagga-reload should raise Exception instead of exiting

Signed-off-by: Daniel Walton <dwalton@cumulusnetworks.com>
Reviewed-by: Donald Sharp <sharpd@cumulusnetworks.com>
NCLU imports quagga-reload.py and uses its Config class to parse
Quagga.conf.  The Config class will call 'vtysh -m -f Quagga.conf" and
if that exited with an error Config would call sys.exit(1) which in my
cases causes the NCLU daemon to exit which is bad.  The fix is to have
the Config class raise an exception instead of exiting, then NCLU can
catch the exception, log it and move on.

(cherry picked from commit 276887bb1c2961fa37b42ce7160346f1417577a8)
tools/quagga-reload.py