diff options
author | Maksim Andrianov <maksimandrianov1@gmail.com> | 2019-05-24 15:23:40 +0300 |
---|---|---|
committer | mpimenov <mpimenov@users.noreply.github.com> | 2019-05-29 16:58:56 +0300 |
commit | f2edf6d87091d08dd633d10e3393058a8c044f37 (patch) | |
tree | 0b630d5b72bfc30acb90af01d044830bdbf0a7e0 /tools | |
parent | 648dc4217889fe3cedc25a8314680e824ab9626a (diff) |
[python] Improved logging.
Diffstat (limited to 'tools')
-rw-r--r-- | tools/python/maps_generator/generator/decorators.py | 6 | ||||
-rw-r--r-- | tools/python/maps_generator/generator/env.py | 9 |
2 files changed, 12 insertions, 3 deletions
diff --git a/tools/python/maps_generator/generator/decorators.py b/tools/python/maps_generator/generator/decorators.py index baa9e53c48..aba32092ea 100644 --- a/tools/python/maps_generator/generator/decorators.py +++ b/tools/python/maps_generator/generator/decorators.py @@ -16,7 +16,10 @@ def stage(func): def wrap(env: Env, *args, **kwargs): func_name = func.__name__ stage_formatted = " ".join(func_name.split("_")).capitalize() + logfile = os.path.join(env.log_path, f"{func_name}.log") + log_handler = logging.FileHandler(logfile) if not env.is_accepted_stage(func_name): + logger.addHandler(log_handler) logger.info(f"{stage_formatted} was not accepted.") return main_status = env.main_status @@ -27,12 +30,13 @@ def stage(func): main_status.update_status() logger.info(f"{stage_formatted}: start ...") t = time.time() - with open(os.path.join(env.log_path, f"{func_name}.log"), "w") as l: + with open(logfile, "w") as l: env.set_subprocess_out(l) func(env, *args, **kwargs) d = time.time() - t logger.info(f"{stage_formatted}: finished in " f"{str(datetime.timedelta(seconds=d))}") + logger.removeHandler(log_handler) return wrap diff --git a/tools/python/maps_generator/generator/env.py b/tools/python/maps_generator/generator/env.py index a087a783eb..7d0211993b 100644 --- a/tools/python/maps_generator/generator/env.py +++ b/tools/python/maps_generator/generator/env.py @@ -123,8 +123,13 @@ class Env: _write_version(self.out_path, self.planet_version) self._skipped_stages = set(self.skip) - logger.info( - f"The following maps will build: {', '.join(self.countries)}.") + + printed_countries = ", ".join(self.countries) + if len(self.countries) > 50: + printed_countries = (f"{', '.join(self.countries[:25])}, ..., " + f"{', '.join(self.countries[-25:])}") + logger.info(f"The following {len(self.countries)} maps will build: " + f"{printed_countries}.") logger.info("Finish setup") def get_mwm_names(self): |