From c3d7f69b2a6b99433e790ea96f3468cd100312c5 Mon Sep 17 00:00:00 2001
From: Guido Trotter <ultrotter@google.com>
Date: Fri, 27 Jun 2008 14:27:27 +0000
Subject: [PATCH] ganeti-noded: Fix handling of QuitGanetiException
- s/GanetiQuitException/QuitGanetiException/
- Look for the arguments in err.args, not err itself
Reviewed-by: iustinp
---
daemons/ganeti-noded | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/daemons/ganeti-noded b/daemons/ganeti-noded
index 5388660e8..27baa1d94 100755
--- a/daemons/ganeti-noded
+++ b/daemons/ganeti-noded
@@ -80,13 +80,13 @@ class ServerObject(BaseHTTPServer.BaseHTTPRequestHandler):
except errors.QuitGanetiException, err:
global _EXIT_GANETI_NODED
_EXIT_GANETI_NODED = True
- if isinstance(err, tuple) and len(err) == 2:
- if err[0]:
+ if isinstance(err.args, tuple) and len(err.args) == 2:
+ if err.args[0]:
self.send_error(500, "Error: %s" % str(err[1]))
else:
- payload = simplejson.dumps(err[1])
+ payload = simplejson.dumps(err.args[1])
else:
- self.log_message('GanetiQuitException Usage Error')
+ self.log_message('QuitGanetiException Usage Error')
self.send_error(500, "Error: %s" % str(err))
except Exception, err:
self.send_error(500, "Error: %s" % str(err))
--
GitLab