From 59b020c0d4f301cbd7c38286d1dd5acc06f7efe9 Mon Sep 17 00:00:00 2001 From: PCoder Date: Wed, 25 Jul 2018 21:41:05 +0200 Subject: [PATCH 1/6] Replace all occurrences of logger.info with logger.error --- hosting/views.py | 2 +- opennebula_api/models.py | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/hosting/views.py b/hosting/views.py index 6af1885b..f2c51cf5 100644 --- a/hosting/views.py +++ b/hosting/views.py @@ -1394,7 +1394,7 @@ class VirtualMachineView(LoginRequiredMixin, View): terminated = manager.delete_vm(vm.id) if not terminated: - logger.debug( + logger.error( "manager.delete_vm returned False. Hence, error making " "xml-rpc call to delete vm failed." ) diff --git a/opennebula_api/models.py b/opennebula_api/models.py index 29632009..611a0712 100644 --- a/opennebula_api/models.py +++ b/opennebula_api/models.py @@ -110,7 +110,7 @@ class OpenNebulaManager(): raise UserExistsError() except OpenNebulaException as err: logger.error('OpenNebulaException error: {0}'.format(err)) - logger.debug('User exists but password is wrong') + logger.error('User exists but password is wrong') raise UserCredentialError() except WrongNameError: @@ -148,7 +148,7 @@ class OpenNebulaManager(): ) return opennebula_user except ConnectionRefusedError: - logger.info( + logger.error( 'Could not connect to host: {host} via protocol {protocol}'.format( host=settings.OPENNEBULA_DOMAIN, protocol=settings.OPENNEBULA_PROTOCOL) @@ -160,7 +160,7 @@ class OpenNebulaManager(): user_pool = oca.UserPool(self.oneadmin_client) user_pool.info() except ConnectionRefusedError: - logger.info( + logger.error( 'Could not connect to host: {host} via protocol {protocol}'.format( host=settings.OPENNEBULA_DOMAIN, protocol=settings.OPENNEBULA_PROTOCOL) @@ -174,7 +174,7 @@ class OpenNebulaManager(): vm_pool.info() return vm_pool except AttributeError: - logger.info('Could not connect via client, using oneadmin instead') + logger.error('Could not connect via client, using oneadmin instead') try: vm_pool = oca.VirtualMachinePool(self.oneadmin_client) vm_pool.info(filter=-2) @@ -183,7 +183,7 @@ class OpenNebulaManager(): raise ConnectionRefusedError except ConnectionRefusedError: - logger.info( + logger.error( 'Could not connect to host: {host} via protocol {protocol}'.format( host=settings.OPENNEBULA_DOMAIN, protocol=settings.OPENNEBULA_PROTOCOL) @@ -325,14 +325,14 @@ class OpenNebulaManager(): ) vm_terminated = True except socket.timeout as socket_err: - logger.info("Socket timeout error: {0}".format(socket_err)) + logger.error("Socket timeout error: {0}".format(socket_err)) except OpenNebulaException as opennebula_err: - logger.info( + logger.error( "OpenNebulaException error: {0}".format(opennebula_err)) except OSError as os_err: - logger.info("OSError : {0}".format(os_err)) + logger.error("OSError : {0}".format(os_err)) except ValueError as value_err: - logger.info("ValueError : {0}".format(value_err)) + logger.error("ValueError : {0}".format(value_err)) return vm_terminated @@ -342,7 +342,7 @@ class OpenNebulaManager(): template_pool.info() return template_pool except ConnectionRefusedError: - logger.info( + logger.error( """Could not connect to host: {host} via protocol {protocol}""".format( host=settings.OPENNEBULA_DOMAIN, From a5cdfab306e86f44ae3c9ba1d0f9e1eaed0051fe Mon Sep 17 00:00:00 2001 From: PCoder Date: Wed, 25 Jul 2018 21:53:33 +0200 Subject: [PATCH 2/6] Send an email to admin if the VM is still there after 30 seconds of the VM terminate calll --- hosting/views.py | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/hosting/views.py b/hosting/views.py index f2c51cf5..476c62ff 100644 --- a/hosting/views.py +++ b/hosting/views.py @@ -1404,6 +1404,9 @@ class VirtualMachineView(LoginRequiredMixin, View): try: manager.get_vm(vm.id) except WrongIdError: + logger.error( + "VM {} not found. So, its terminated.".format(vm.id) + ) response['status'] = True response['text'] = ugettext('Terminated') vm_detail_obj = VMDetail.objects.filter( @@ -1421,6 +1424,19 @@ class VirtualMachineView(LoginRequiredMixin, View): break else: sleep(2) + if 'status' not in response: + vm_msg = "VM {} has not terminated yet!".format(vm.id) + admin_email_body['status'] = vm_msg + logger.error(vm_msg) + err_email_data = { + 'subject': vm_msg, + 'from_email': settings.DCL_SUPPORT_FROM_ADDRESS, + 'to': ['info@ungleich.ch'], + 'body': "Called VM terminate xml-rpc and waited for over " + "30 seconds for the VM to disappear. But, it did " + "not happen. So, please verify!", + } + send_plain_email_task.delay(err_email_data) context = { 'vm_name': vm_name, 'base_url': "{0}://{1}".format( From df10e8441892d715e0137874e694d909d5bc5162 Mon Sep 17 00:00:00 2001 From: PCoder Date: Wed, 25 Jul 2018 22:04:44 +0200 Subject: [PATCH 3/6] Add owner's email to the subject --- hosting/views.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/hosting/views.py b/hosting/views.py index 476c62ff..d256115d 100644 --- a/hosting/views.py +++ b/hosting/views.py @@ -1425,7 +1425,9 @@ class VirtualMachineView(LoginRequiredMixin, View): else: sleep(2) if 'status' not in response: - vm_msg = "VM {} has not terminated yet!".format(vm.id) + vm_msg = "VM {} of user {} has not terminated yet!".format( + vm.id, owner.email + ) admin_email_body['status'] = vm_msg logger.error(vm_msg) err_email_data = { From 7d4cf5c3c28332cde769a313d9e74e0459f5d53d Mon Sep 17 00:00:00 2001 From: PCoder Date: Fri, 7 Sep 2018 22:46:18 +0200 Subject: [PATCH 4/6] Fix flake8 error --- utils/hosting_utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/hosting_utils.py b/utils/hosting_utils.py index 2918deb3..8354f485 100644 --- a/utils/hosting_utils.py +++ b/utils/hosting_utils.py @@ -127,7 +127,7 @@ def get_vm_price_with_vat(cpu, memory, ssd_size, hdd_size=0, vat = vat.quantize(cents, decimal.ROUND_HALF_UP) discount = { 'name': pricing.discount_name, - 'amount': round(float(pricing.discount_amount),2) + 'amount': round(float(pricing.discount_amount), 2) } return (round(float(price), 2), round(float(vat), 2), round(float(vat_percent)), discount) From ff6df8cd58804016e29df51f20eed752a35a359e Mon Sep 17 00:00:00 2001 From: PCoder Date: Fri, 7 Sep 2018 23:11:46 +0200 Subject: [PATCH 5/6] Simplify logic --- hosting/views.py | 29 +++++++++++------------------ 1 file changed, 11 insertions(+), 18 deletions(-) diff --git a/hosting/views.py b/hosting/views.py index 09d3ae66..8435a9c6 100644 --- a/hosting/views.py +++ b/hosting/views.py @@ -1430,21 +1430,12 @@ class VirtualMachineView(LoginRequiredMixin, View): break else: sleep(2) - if 'status' not in response: - vm_msg = "VM {} of user {} has not terminated yet!".format( - vm.id, owner.email + if not response['status']: + response['details'] = ( + "Called VM terminate xml-rpc and waited for over " + "30 seconds for the VM to disappear. But, it did " + "not happen. So, please verify!" ) - admin_email_body['status'] = vm_msg - logger.error(vm_msg) - err_email_data = { - 'subject': vm_msg, - 'from_email': settings.DCL_SUPPORT_FROM_ADDRESS, - 'to': ['info@ungleich.ch'], - 'body': "Called VM terminate xml-rpc and waited for over " - "30 seconds for the VM to disappear. But, it did " - "not happen. So, please verify!", - } - send_plain_email_task.delay(err_email_data) context = { 'vm_name': vm_name, 'base_url': "{0}://{1}".format( @@ -1465,11 +1456,13 @@ class VirtualMachineView(LoginRequiredMixin, View): email = BaseEmail(**email_data) email.send() admin_email_body.update(response) + admin_msg_sub = "VM and Subscription for VM {} and user: {}".format( + vm.id, + owner.email + ) email_to_admin_data = { - 'subject': "Deleted VM and Subscription for VM {vm_id} and " - "user: {user}".format( - vm_id=vm.id, user=owner.email - ), + 'subject': ("Deleted " if response['status'] + else "ERROR deleting ") + admin_msg_sub, 'from_email': settings.DCL_SUPPORT_FROM_ADDRESS, 'to': ['info@ungleich.ch'], 'body': "\n".join( From a7afbec5b4ee296ddf52e2ee56d26d7d676e2147 Mon Sep 17 00:00:00 2001 From: PCoder Date: Fri, 7 Sep 2018 23:14:57 +0200 Subject: [PATCH 6/6] Fix flake8 error --- hosting/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosting/views.py b/hosting/views.py index 8435a9c6..c16b6d07 100644 --- a/hosting/views.py +++ b/hosting/views.py @@ -1462,7 +1462,7 @@ class VirtualMachineView(LoginRequiredMixin, View): ) email_to_admin_data = { 'subject': ("Deleted " if response['status'] - else "ERROR deleting ") + admin_msg_sub, + else "ERROR deleting ") + admin_msg_sub, 'from_email': settings.DCL_SUPPORT_FROM_ADDRESS, 'to': ['info@ungleich.ch'], 'body': "\n".join(