diff options
| -rw-r--r-- | cobbler/cobblerd.py | 2 | ||||
| -rw-r--r-- | cobbler/remote.py | 14 |
2 files changed, 1 insertions, 15 deletions
diff --git a/cobbler/cobblerd.py b/cobbler/cobblerd.py index 7ba1afd..fc25a56 100644 --- a/cobbler/cobblerd.py +++ b/cobbler/cobblerd.py @@ -87,7 +87,7 @@ def do_avahi(bootapi, settings, logger): "%s" % settings.xmlrpc_port ] proc = sub_process.Popen(cmd, shell=False, stderr=sub_process.PIPE, stdout=sub_process.PIPE) proc.communicate()[0] - log(logger, "avahi service terminated: %d" % result) + log(logger, "avahi service terminated") def do_xmlrpc(bootapi, settings, port, logger): diff --git a/cobbler/remote.py b/cobbler/remote.py index e729646..421e66c 100644 --- a/cobbler/remote.py +++ b/cobbler/remote.py @@ -696,16 +696,6 @@ if __name__ == "__main__": testuser = "testuser" testpass = "llamas2007" - logger = logging.getLogger("cobbler.cobblerd") - logger.setLevel(logging.DEBUG) - ch = logging.FileHandler("/var/log/cobbler/cobblerd.log") - ch.setLevel(logging.DEBUG) - formatter = logging.Formatter("%(asctime)s - %(name)s - %(levelname)s - %(message)s") - ch.setFormatter(formatter) - logger.addHandler(ch) - api = cobbler_api.BootAPI() - - remote = CobblerReadWriteXMLRPCInterface(api,logger) token = remote.login(testuser,testpass) print token rc = remote.test(token) @@ -761,10 +751,6 @@ if __name__ == "__main__": # now simulate hitting a "sync" button in a WebUI print remote.sync(token) - # some debug that isn't possible with a real remote connection - print remote.object_cache - print remote.token_cache - # the following code just tests a failed connection: #remote = CobblerReadWriteXMLRPCInterface(api,logger) #try: |