From 432e15ff3559c92f669efb7c6a09fb609bd00b53 Mon Sep 17 00:00:00 2001 From: Dan Mick Date: Thu, 7 Jul 2016 10:50:48 -0700 Subject: [PATCH] teuthology: log version number Round 2, this time with testing Signed-off-by: Dan Mick --- teuthology/__init__.py | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/teuthology/__init__.py b/teuthology/__init__.py index d12e163498..6e93e379e0 100644 --- a/teuthology/__init__.py +++ b/teuthology/__init__.py @@ -14,10 +14,20 @@ monkey.patch_all() import logging import os +import subprocess +__version__ = '1.0.0' -__version__ = '0.1.0' +# do our best, but if it fails, continue with above +try: + __version__ += '-' + subprocess.check_output( + 'git rev-parse --short HEAD'.split(), + cwd=os.path.dirname(os.path.realpath(__file__)) + ).strip() +except Exception as e: + # before logging; should be unusual + print >>sys.stderr, 'Can\'t get version from git rev-parse', e # If we are running inside a virtualenv, ensure we have its 'bin' directory in # our PATH. This doesn't happen automatically if scripts are called without @@ -38,6 +48,8 @@ logging.basicConfig( format='%(asctime)s.%(msecs)03d %(levelname)s:%(name)s:%(message)s') log = logging.getLogger(__name__) +log.debug('teuthology version: %s', __version__) + def setup_log_file(log_path): root_logger = logging.getLogger() @@ -54,3 +66,4 @@ def setup_log_file(log_path): handler = logging.FileHandler(filename=log_path) handler.setFormatter(formatter) root_logger.addHandler(handler) + root_logger.info('teuthology version: %s', __version__) -- 2.39.5