ChangeSet 1.1902, 2005/06/17 23:40:37+01:00, iap10@xxxxxxxxxxxxxxxxxxx
Subject: [Xen-devel] [PATCH] _perform_err
the declaration of _perform_err needs at least three arguments
(exlcuding self), but gets onky called with two args at many
places. This messes up xend-debug.log.
Patch is against 2.0-testing, but applied cleanly to unstable
as well, when I checked last.
From: Kurt Garloff <kurt@xxxxxxxxxx>
Signed-off-by: ian@xxxxxxxxxxxxx
SrvBase.py | 3 +--
SrvConsole.py | 2 +-
SrvConsoleDir.py | 2 +-
SrvDir.py | 2 +-
SrvDmesg.py | 2 +-
SrvDomainDir.py | 2 +-
SrvNode.py | 2 +-
SrvVnetDir.py | 2 +-
SrvXendLog.py | 2 +-
9 files changed, 9 insertions(+), 10 deletions(-)
diff -Nru a/tools/python/xen/xend/server/SrvBase.py
b/tools/python/xen/xend/server/SrvBase.py
--- a/tools/python/xen/xend/server/SrvBase.py 2005-06-17 21:05:05 -04:00
+++ b/tools/python/xen/xend/server/SrvBase.py 2005-06-17 21:05:05 -04:00
@@ -106,8 +106,7 @@
try:
val = op_method(op, req)
except Exception, err:
- self._perform_err(err, op, req)
- return ''
+ return self._perform_err(err, op, req)
if isinstance(val, defer.Deferred):
val.addCallback(self._perform_cb, op, req, dfr=1)
diff -Nru a/tools/python/xen/xend/server/SrvConsole.py
b/tools/python/xen/xend/server/SrvConsole.py
--- a/tools/python/xen/xend/server/SrvConsole.py 2005-06-17 21:05:05
-04:00
+++ b/tools/python/xen/xend/server/SrvConsole.py 2005-06-17 21:05:05
-04:00
@@ -36,7 +36,7 @@
req.write('</body></html>')
return ''
except Exception, ex:
- self._perform_err(ex, req)
+ self._perform_err(ex, "console", req)
def form(self, req):
req.write('<form method="post" action="%s">' % req.prePathURL())
diff -Nru a/tools/python/xen/xend/server/SrvConsoleDir.py
b/tools/python/xen/xend/server/SrvConsoleDir.py
--- a/tools/python/xen/xend/server/SrvConsoleDir.py 2005-06-17 21:05:05
-04:00
+++ b/tools/python/xen/xend/server/SrvConsoleDir.py 2005-06-17 21:05:05
-04:00
@@ -44,7 +44,7 @@
req.write("</body></html>")
return ''
except Exception, ex:
- self._perform_err(ex, req)
+ self._perform_err(ex, "ls_console", req)
def ls_console(self, req, use_sxp=0):
url = req.prePathURL()
diff -Nru a/tools/python/xen/xend/server/SrvDir.py
b/tools/python/xen/xend/server/SrvDir.py
--- a/tools/python/xen/xend/server/SrvDir.py 2005-06-17 21:05:05 -04:00
+++ b/tools/python/xen/xend/server/SrvDir.py 2005-06-17 21:05:05 -04:00
@@ -88,7 +88,7 @@
req.write('</body></html>')
return ''
except Exception, ex:
- self._perform_err(ex, "GET", req)
+ self._perform_err(ex, "ls", req)
def ls(self, req, use_sxp=0):
url = req.prePathURL()
diff -Nru a/tools/python/xen/xend/server/SrvDmesg.py
b/tools/python/xen/xend/server/SrvDmesg.py
--- a/tools/python/xen/xend/server/SrvDmesg.py 2005-06-17 21:05:05 -04:00
+++ b/tools/python/xen/xend/server/SrvDmesg.py 2005-06-17 21:05:05 -04:00
@@ -31,7 +31,7 @@
req.write('</pre></body></html>')
return ''
except Exception, ex:
- self._perform_err(ex, req)
+ self._perform_err(ex, "dmesg", req)
def info(self):
return self.xd.info()
diff -Nru a/tools/python/xen/xend/server/SrvDomainDir.py
b/tools/python/xen/xend/server/SrvDomainDir.py
--- a/tools/python/xen/xend/server/SrvDomainDir.py 2005-06-17 21:05:05
-04:00
+++ b/tools/python/xen/xend/server/SrvDomainDir.py 2005-06-17 21:05:05
-04:00
@@ -133,7 +133,7 @@
req.write("</body></html>")
return ''
except Exception, ex:
- self._perform_err(ex, req)
+ self._perform_err(ex, "ls_domain", req)
def ls_domain(self, req, use_sxp=0):
url = req.prePathURL()
diff -Nru a/tools/python/xen/xend/server/SrvNode.py
b/tools/python/xen/xend/server/SrvNode.py
--- a/tools/python/xen/xend/server/SrvNode.py 2005-06-17 21:05:05 -04:00
+++ b/tools/python/xen/xend/server/SrvNode.py 2005-06-17 21:05:05 -04:00
@@ -60,7 +60,7 @@
req.write('</body></html>')
return ''
except Exception, ex:
- self._perform_err(ex, req)
+ self._perform_err(ex, "node info", req)
def info(self):
return self.xn.info()
diff -Nru a/tools/python/xen/xend/server/SrvVnetDir.py
b/tools/python/xen/xend/server/SrvVnetDir.py
--- a/tools/python/xen/xend/server/SrvVnetDir.py 2005-06-17 21:05:05
-04:00
+++ b/tools/python/xen/xend/server/SrvVnetDir.py 2005-06-17 21:05:05
-04:00
@@ -88,7 +88,7 @@
req.write("</body></html>")
return ''
except Exception, ex:
- self._perform_err(ex, req)
+ self._perform_err(ex, "ls_vnet", req)
def ls_vnet(self, req, use_sxp=0):
url = req.prePathURL()
diff -Nru a/tools/python/xen/xend/server/SrvXendLog.py
b/tools/python/xen/xend/server/SrvXendLog.py
--- a/tools/python/xen/xend/server/SrvXendLog.py 2005-06-17 21:05:05
-04:00
+++ b/tools/python/xen/xend/server/SrvXendLog.py 2005-06-17 21:05:05
-04:00
@@ -21,4 +21,4 @@
try:
return self.logfile.render(req)
except Exception, ex:
- self._perform_err(ex, req)
+ self._perform_err(ex, "log", req)
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home