diff options
| author | Narayan Desai <desai@mcs.anl.gov> | 2009-09-18 02:35:13 +0000 |
|---|---|---|
| committer | Narayan Desai <desai@mcs.anl.gov> | 2009-09-18 02:35:13 +0000 |
| commit | ef919aad378b25684fde42f1ecec29e228c3a68e (patch) | |
| tree | e8b6ef80ad41011becd04e5a32465b2dc70da41f | |
| parent | 346a08e45ea838742177b140e893ee98e07e6d3c (diff) | |
| download | bcfg2-ef919aad378b25684fde42f1ecec29e228c3a68e.tar.gz bcfg2-ef919aad378b25684fde42f1ecec29e228c3a68e.tar.bz2 bcfg2-ef919aad378b25684fde42f1ecec29e228c3a68e.zip | |
Xcmd: Improve error handling for unknown rmi methods
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@5443 ce84e21b-d406-0410-9b95-82705330c041
| -rw-r--r-- | src/lib/Component.py | 3 | ||||
| -rw-r--r-- | src/lib/Server/Admin/Xcmd.py | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/lib/Component.py b/src/lib/Component.py index 619fab3c5..e061a12bc 100644 --- a/src/lib/Component.py +++ b/src/lib/Component.py @@ -198,6 +198,9 @@ class Component (object): else: try: method_func = self._resolve_exposed_method(method) + except NoExposedMethod: + self.logger.error("Unknown method %s" % (method)) + raise xmlrpclib.Fault(7, "Unknown method %s" % method) except Exception, e: if getattr(e, "log", True): self.logger.error(e, exc_info=True) diff --git a/src/lib/Server/Admin/Xcmd.py b/src/lib/Server/Admin/Xcmd.py index 7591c0c45..7d6195fa0 100644 --- a/src/lib/Server/Admin/Xcmd.py +++ b/src/lib/Server/Admin/Xcmd.py @@ -41,7 +41,7 @@ class Xcmd(Bcfg2.Server.Admin.Mode): try: data = apply(getattr(proxy, cmd), args) except xmlrpclib.Fault, flt: - if flt.faultCode == 1: + if flt.faultCode == 7: print("Unknown method %s" % cmd) return else: |