From 87172073a6c87178dca378501fd56c52f6f76a4a Mon Sep 17 00:00:00 2001 From: Takuto Ikuta Date: Tue, 26 Apr 2022 23:35:31 +0000 Subject: [PATCH] ninjalog_uploader_wrapper.py: handle broken config file This is to make the script work even when config file is broken. Change-Id: I6c2a090b01026b5747137bcc9fdec0bd5c03f75e Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/3607373 Auto-Submit: Takuto Ikuta Reviewed-by: Fumitoshi Ukai Commit-Queue: Fumitoshi Ukai --- ninjalog_uploader_wrapper.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/ninjalog_uploader_wrapper.py b/ninjalog_uploader_wrapper.py index 7ca7cf838..3b1d132f9 100755 --- a/ninjalog_uploader_wrapper.py +++ b/ninjalog_uploader_wrapper.py @@ -23,7 +23,16 @@ VERSION = 3 def LoadConfig(): if os.path.isfile(CONFIG): with open(CONFIG, 'r') as f: - config = json.load(f) + try: + config = json.load(f) + except Exception: + # Set default value when failed to load config. + config = { + 'is-googler': ninjalog_uploader.IsGoogler(), + 'countdown': 10, + 'version': VERSION, + } + if config['version'] == VERSION: config['countdown'] = max(0, config['countdown'] - 1) return config