From ff3781ff733cb730a191e36af02acf11033ea9b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= <sybren@stuvel.eu>
Date: Tue, 13 Feb 2018 17:22:24 +0100
Subject: [PATCH] Always log the version of Flamenco Manager.
---
CHANGELOG.md | 5 +++++
flamenco_worker/cli.py | 16 ++++++++++++++++
2 files changed, 21 insertions(+)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e78b043e..a69f94ca 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,11 @@
This file logs the changes that are actually interesting to users (new features,
changed functionality, fixed bugs).
+## Version 2.1.1 (in development)
+
+- Always log the version of Flamenco Manager.
+
+
## Version 2.1.0 (2018-01-04)
- Python 3.5.4 is required as minimum Python version.
diff --git a/flamenco_worker/cli.py b/flamenco_worker/cli.py
index f32474b3..f7375988 100644
--- a/flamenco_worker/cli.py
+++ b/flamenco_worker/cli.py
@@ -48,6 +48,8 @@ def main():
log = logging.getLogger(__name__)
log.debug('Starting, pid=%d', os.getpid())
+ log_startup()
+
if args.test:
log.warning('Test mode enabled, overriding task_types=%r',
confparser.value('task_types'))
@@ -260,5 +262,19 @@ def construct_asyncio_loop() -> asyncio.AbstractEventLoop:
return loop
+def log_startup():
+ """Log the version of Flamenco Worker."""
+
+ from . import __version__
+
+ log = logging.getLogger(__name__)
+ old_level = log.level
+ try:
+ log.setLevel(logging.INFO)
+ log.info('Starting Flamenco Worker %s', __version__)
+ finally:
+ log.setLevel(old_level)
+
+
if __name__ == '__main__':
main()
--
GitLab