ia64/xen-unstable

changeset 5497:2f99f3e3c506

bitkeeper revision 1.1159.258.168 (42b351653L3XVvz6UCiRgtfHHvj-Eg)

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@garloff.de>
Signed-off-by: ian@xensource.com
author iap10@tetris.cl.cam.ac.uk
date Fri Jun 17 22:40:37 2005 +0000 (2005-06-17)
parents 5a5f81b0e950
children ae0cf78f78bd
files tools/python/xen/xend/server/SrvBase.py tools/python/xen/xend/server/SrvConsole.py tools/python/xen/xend/server/SrvConsoleDir.py tools/python/xen/xend/server/SrvDir.py tools/python/xen/xend/server/SrvDmesg.py tools/python/xen/xend/server/SrvDomainDir.py tools/python/xen/xend/server/SrvNode.py tools/python/xen/xend/server/SrvVnetDir.py tools/python/xen/xend/server/SrvXendLog.py
line diff
     1.1 --- a/tools/python/xen/xend/server/SrvBase.py	Mon Jun 13 13:17:02 2005 +0000
     1.2 +++ b/tools/python/xen/xend/server/SrvBase.py	Fri Jun 17 22:40:37 2005 +0000
     1.3 @@ -106,8 +106,7 @@ class SrvBase(resource.Resource):
     1.4          try:
     1.5              val = op_method(op, req)
     1.6          except Exception, err:
     1.7 -            self._perform_err(err, op, req)
     1.8 -            return ''
     1.9 +            return self._perform_err(err, op, req)
    1.10              
    1.11          if isinstance(val, defer.Deferred):
    1.12              val.addCallback(self._perform_cb, op, req, dfr=1)
     2.1 --- a/tools/python/xen/xend/server/SrvConsole.py	Mon Jun 13 13:17:02 2005 +0000
     2.2 +++ b/tools/python/xen/xend/server/SrvConsole.py	Fri Jun 17 22:40:37 2005 +0000
     2.3 @@ -36,7 +36,7 @@ class SrvConsole(SrvDir):
     2.4                  req.write('</body></html>')
     2.5              return ''
     2.6          except Exception, ex:
     2.7 -            self._perform_err(ex, req)
     2.8 +            self._perform_err(ex, "console", req)
     2.9  
    2.10      def form(self, req):
    2.11          req.write('<form method="post" action="%s">' % req.prePathURL())
     3.1 --- a/tools/python/xen/xend/server/SrvConsoleDir.py	Mon Jun 13 13:17:02 2005 +0000
     3.2 +++ b/tools/python/xen/xend/server/SrvConsoleDir.py	Fri Jun 17 22:40:37 2005 +0000
     3.3 @@ -44,7 +44,7 @@ class SrvConsoleDir(SrvDir):
     3.4                  req.write("</body></html>")
     3.5              return ''
     3.6          except Exception, ex:
     3.7 -            self._perform_err(ex, req)
     3.8 +            self._perform_err(ex, "ls_console", req)
     3.9  
    3.10      def ls_console(self, req, use_sxp=0):
    3.11          url = req.prePathURL()
     4.1 --- a/tools/python/xen/xend/server/SrvDir.py	Mon Jun 13 13:17:02 2005 +0000
     4.2 +++ b/tools/python/xen/xend/server/SrvDir.py	Fri Jun 17 22:40:37 2005 +0000
     4.3 @@ -88,7 +88,7 @@ class SrvDir(SrvBase):
     4.4                  req.write('</body></html>')
     4.5              return ''
     4.6          except Exception, ex:
     4.7 -            self._perform_err(ex, "GET", req)
     4.8 +            self._perform_err(ex, "ls", req)
     4.9              
    4.10      def ls(self, req, use_sxp=0):
    4.11          url = req.prePathURL()
     5.1 --- a/tools/python/xen/xend/server/SrvDmesg.py	Mon Jun 13 13:17:02 2005 +0000
     5.2 +++ b/tools/python/xen/xend/server/SrvDmesg.py	Fri Jun 17 22:40:37 2005 +0000
     5.3 @@ -31,7 +31,7 @@ class SrvDmesg(SrvDir):
     5.4                  req.write('</pre></body></html>')
     5.5              return ''
     5.6          except Exception, ex:
     5.7 -            self._perform_err(ex, req)
     5.8 +            self._perform_err(ex, "dmesg", req)
     5.9              
    5.10      def info(self):
    5.11          return self.xd.info()
     6.1 --- a/tools/python/xen/xend/server/SrvDomainDir.py	Mon Jun 13 13:17:02 2005 +0000
     6.2 +++ b/tools/python/xen/xend/server/SrvDomainDir.py	Fri Jun 17 22:40:37 2005 +0000
     6.3 @@ -133,7 +133,7 @@ class SrvDomainDir(SrvDir):
     6.4                  req.write("</body></html>")
     6.5              return ''
     6.6          except Exception, ex:
     6.7 -            self._perform_err(ex, req)
     6.8 +            self._perform_err(ex, "ls_domain", req)
     6.9  
    6.10      def ls_domain(self, req, use_sxp=0):
    6.11          url = req.prePathURL()
     7.1 --- a/tools/python/xen/xend/server/SrvNode.py	Mon Jun 13 13:17:02 2005 +0000
     7.2 +++ b/tools/python/xen/xend/server/SrvNode.py	Fri Jun 17 22:40:37 2005 +0000
     7.3 @@ -60,7 +60,7 @@ class SrvNode(SrvDir):
     7.4                  req.write('</body></html>')
     7.5              return ''
     7.6          except Exception, ex:
     7.7 -            self._perform_err(ex, req)
     7.8 +            self._perform_err(ex, "node info", req)
     7.9              
    7.10      def info(self):
    7.11          return self.xn.info()
     8.1 --- a/tools/python/xen/xend/server/SrvVnetDir.py	Mon Jun 13 13:17:02 2005 +0000
     8.2 +++ b/tools/python/xen/xend/server/SrvVnetDir.py	Fri Jun 17 22:40:37 2005 +0000
     8.3 @@ -88,7 +88,7 @@ class SrvVnetDir(SrvDir):
     8.4                  req.write("</body></html>")
     8.5              return ''
     8.6          except Exception, ex:
     8.7 -            self._perform_err(ex, req)
     8.8 +            self._perform_err(ex, "ls_vnet", req)
     8.9  
    8.10      def ls_vnet(self, req, use_sxp=0):
    8.11          url = req.prePathURL()
     9.1 --- a/tools/python/xen/xend/server/SrvXendLog.py	Mon Jun 13 13:17:02 2005 +0000
     9.2 +++ b/tools/python/xen/xend/server/SrvXendLog.py	Fri Jun 17 22:40:37 2005 +0000
     9.3 @@ -21,4 +21,4 @@ class SrvXendLog(SrvDir):
     9.4          try:
     9.5              return self.logfile.render(req)
     9.6          except Exception, ex:
     9.7 -            self._perform_err(ex, req)
     9.8 +            self._perform_err(ex, "log", req)