From 25db327416084d6e78dcbb5a63589e1557e7e725 Mon Sep 17 00:00:00 2001 From: micafer Date: Wed, 29 Jul 2015 11:42:08 +0200 Subject: [PATCH] Code improvements --- IM/VirtualMachine.py | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/IM/VirtualMachine.py b/IM/VirtualMachine.py index 255342fbb..3179d6f8c 100644 --- a/IM/VirtualMachine.py +++ b/IM/VirtualMachine.py @@ -632,9 +632,13 @@ def get_ctxt_log(self, remote_dir, delete = False): # Remove problematic chars conf_out = filter(lambda x: x in string.printable, conf_out).encode("ascii", "replace") - if delete: - ssh.sftp_remove(remote_dir + '/ctxt_agent.log') - except Exception: + try: + if delete: + ssh.sftp_remove(remote_dir + '/ctxt_agent.log') + except: + VirtualMachine.logger.exception("Error deleting remote contextualization process log") + pass + except: VirtualMachine.logger.exception("Error getting contextualization process log") self.configured = False finally: @@ -651,8 +655,12 @@ def get_ctxt_output(self, remote_dir, delete = False): # Get the JSON output of the ctxt_agent ssh.sftp_get(remote_dir + '/ctxt_agent.out', tmp_dir + '/ctxt_agent.out') with open(tmp_dir + '/ctxt_agent.out') as f: ctxt_agent_out = json.load(f) - if delete: - ssh.sftp_remove(remote_dir + '/ctxt_agent.out') + try: + if delete: + ssh.sftp_remove(remote_dir + '/ctxt_agent.out') + except: + VirtualMachine.logger.exception("Error deleting remote contextualization process output") + pass # And process it self.process_ctxt_agent_out(ctxt_agent_out) except Exception, ex: