From 132feb9afce5a753b2b48dcf161312c2020863fb Mon Sep 17 00:00:00 2001 From: David Goh Date: Wed, 29 Nov 2023 16:51:01 +1100 Subject: [PATCH] Cleaner log messages from ecs_composex.compose.compose_services.ComposeService.ephemeral_storage() #719 --- ecs_composex/compose/compose_services/__init__.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/ecs_composex/compose/compose_services/__init__.py b/ecs_composex/compose/compose_services/__init__.py index 2f504f28..e8cd255a 100644 --- a/ecs_composex/compose/compose_services/__init__.py +++ b/ecs_composex/compose/compose_services/__init__.py @@ -504,10 +504,8 @@ def container_start_condition(self, value): @property def ephemeral_storage(self): storage_key = "ecs.ephemeral.storage" - storage_value = set_else_none(storage_key, self.deploy_labels) - if storage_value is None: - return 0 - elif isinstance(storage_value, (int, float)): + storage_value = set_else_none(storage_key, self.deploy_labels, 0) + if isinstance(storage_value, (int, float)): ephemeral_storage = int(storage_value) elif isinstance(storage_value, str): ephemeral_storage = int(set_memory_to_mb(storage_value) / 1024) @@ -518,12 +516,13 @@ def ephemeral_storage(self): "Expected one of", [int, float, str], ) - LOG.info(f"{self.name} - {storage_key} set to {ephemeral_storage}") if ephemeral_storage <= 21: return 0 elif ephemeral_storage > 200: + LOG.warning(f"{self.name} - {storage_key} set to maximum 200 ({ephemeral_storage} > 200)") return 200 else: + LOG.info(f"{self.name} - {storage_key} set to {ephemeral_storage}") return int(ephemeral_storage) @property