diff options
| author | Michael DeHaan <mdehaan@redhat.com> | 2009-02-04 14:58:15 -0500 |
|---|---|---|
| committer | Michael DeHaan <mdehaan@redhat.com> | 2009-02-04 14:58:15 -0500 |
| commit | f7f0bf4f2cfb1d99b06ddd861be06ad94c92d131 (patch) | |
| tree | 79bac30aac9cea9f47938138c849495209881244 /cobbler/api.py | |
| parent | 577d927c81da46ab5c8aaa9edfe4389567acfbf6 (diff) | |
| download | cobbler-f7f0bf4f2cfb1d99b06ddd861be06ad94c92d131.tar.gz cobbler-f7f0bf4f2cfb1d99b06ddd861be06ad94c92d131.tar.xz cobbler-f7f0bf4f2cfb1d99b06ddd861be06ad94c92d131.zip | |
(A)
Working on s390 pseudo PXE
(B)
There's a chance that some datastructures may result in zero lenght yaml writes, which is bad. These changes introduce numerous checks in the serializer to prevent those writes, and also we increase the level of reporting to indicate the source of the error.
Conflicts:
cobbler/cobblerd.py
scripts/cobblerd
Diffstat (limited to 'cobbler/api.py')
| -rw-r--r-- | cobbler/api.py | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/cobbler/api.py b/cobbler/api.py index 813fbb14..0e563306 100644 --- a/cobbler/api.py +++ b/cobbler/api.py @@ -50,6 +50,7 @@ import random import os import yaml import xmlrpclib +import traceback ERROR = 100 INFO = 10 @@ -155,11 +156,18 @@ class BootAPI: if self.is_cobblerd: # don't signal yourself, that's asking for trouble. return True - self.server = xmlrpclib.Server("http://127.0.0.1:25151") - if not remove: - self.server.internal_cache_update(collection_type, name) - else: - self.server.internal_cache_remove(collection_type, name) + self.server = xmlrpclib.Server("http://127.0.0.1:%s" % self.settings().xmlrpc_port) + try: + if not remove: + self.server.internal_cache_update(collection_type, name) + else: + self.server.internal_cache_remove(collection_type, name) + except Exception, e: + if len(e.args) == 2 and e[0] == 111: + # if cobblerd is not running, no harm done, nothing to signal + pass + else: + raise CX("error contacting cobblerd") return False def last_modified_time(self): |