Skip to content

Commit e394de6

Browse files
committed
Added number formating
1 parent c66eb36 commit e394de6

1 file changed

Lines changed: 13 additions & 4 deletions

File tree

src/scheduler.py

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,20 @@
1111
logger = logging.getLogger('ddg_scheduler')
1212

1313

14+
def sizeof_fmt(num):
15+
for unit in ['B', 'KiB', 'MiB', 'GiB', 'TiB']:
16+
if abs(num) < 1024.0:
17+
return "%.1f%s" % (num, unit)
18+
num /= 1024.0
19+
return "%.1f%s" % (num, 'PiB')
20+
21+
1422
def send_slack_message(environment, message, success=True):
1523
webhook_url = environment['SLACK_WEBHOOK']
1624
project_name = environment['PROJECT_NAME']
1725

26+
logger.info(message)
27+
1828
if project_name and len(project_name) > 0:
1929
project_name += " "
2030

@@ -46,7 +56,6 @@ def send_slack_message(environment, message, success=True):
4656
}
4757
]
4858
)
49-
logger.info(message)
5059
except Exception as e:
5160
logger.exception(e)
5261

@@ -144,7 +153,7 @@ def dump_database():
144153
file_size = 0
145154

146155
try:
147-
file_size = os.path.getsize(dump_path) / 1024
156+
file_size = os.path.getsize(dump_path)
148157
except Exception as e:
149158
logger.error("Failed to get size of file.")
150159
logger.exception(e)
@@ -160,10 +169,10 @@ def dump_database():
160169
body=f,
161170
))
162171
logger.info('Glacier upload done.')
163-
send_slack_message(environment, f"Successfully created and uploaded DB dump ({round(file_size, 2)} KB).")
172+
send_slack_message(environment, f"Successfully created and uploaded DB dump ({sizeof_fmt(file_size)}).")
164173
except Exception as e:
165174
logger.exception(e)
166-
send_slack_message(environment, f"Failed to upload DB dump ({round(file_size, 2)} KB) to AWS Glacier. Please check the error in the container logs.", False)
175+
send_slack_message(environment, f"Failed to upload DB dump ({sizeof_fmt(file_size)}) to AWS Glacier. Please check the error in the container logs.", False)
167176
else:
168177
logger.error(f'Database of type {database_type} is not supported. If you see this message something went horribly wrong.')
169178

0 commit comments

Comments
 (0)