From b98a9ad84da574ec8c169b7a8eed222ba34fd258 Mon Sep 17 00:00:00 2001 From: James Valleroy Date: Mon, 15 Dec 2014 23:23:10 -0500 Subject: [PATCH] Don't delete the ejabberd backup database if it fails to load. --- actions/xmpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/actions/xmpp b/actions/xmpp index c02203ded..6c2dae8f1 100755 --- a/actions/xmpp +++ b/actions/xmpp @@ -168,9 +168,13 @@ def subcommand_change_hostname(arguments): # load backup database if os.path.exists(EJABBERD_BACKUP): - time.sleep(10) - subprocess.call(['ejabberdctl', 'load', EJABBERD_BACKUP]) - os.remove(EJABBERD_BACKUP) + try: + subprocess.check_output(['ejabberdctl', + 'load', + EJABBERD_BACKUP]) + os.remove(EJABBERD_BACKUP) + except subprocess.CalledProcessError as err: + print('Failed to load ejabberd backup database: %s', err) else: print('Could not load ejabberd backup database: %s not found' % EJABBERD_BACKUP)