From b3873731c149593c8ad7439d644151d7935585e0 Mon Sep 17 00:00:00 2001 From: Adrian Likins Date: Thu, 30 May 2019 11:30:47 -0400 Subject: [PATCH] On cli startup, log a info line with basic info And 'info' level log the exit code. For ex: [2019-05-30 11:17:51,249 28223 I] ansible_galaxy_cli.cli.galaxy run:236 - \ exe="/home/adrian/venvs/mazer040test/bin/mazer" version=0.5.0 \ config_file="/home/adrian/.ansible/mazer.yml" \ collections_path="/home/adrian/.ansible/collections" \ server=http://localhost:8000 action=install Fixes #267 --- ansible_galaxy_cli/cli/__init__.py | 4 ++-- ansible_galaxy_cli/cli/galaxy.py | 14 +++++++++++++- ansible_galaxy_cli/main.py | 2 +- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/ansible_galaxy_cli/cli/__init__.py b/ansible_galaxy_cli/cli/__init__.py index 97ca3134..e8485d5c 100644 --- a/ansible_galaxy_cli/cli/__init__.py +++ b/ansible_galaxy_cli/cli/__init__.py @@ -161,9 +161,9 @@ def run(self): log.debug('self.args: %s', self.args) if self.config_file_path: - log.info(u"Using %s as config file", to_text(self.config_file_path)) + log.debug(u"Using %s as config file", to_text(self.config_file_path)) else: - log.info(u"No config file found; using defaults") + log.debug(u"No config file found; using defaults") def validate_conflicts(self, vault_opts=False, runas_opts=False, fork_opts=False, vault_rekey_opts=False): ''' check for conflicting options ''' diff --git a/ansible_galaxy_cli/cli/galaxy.py b/ansible_galaxy_cli/cli/galaxy.py index 6bc80860..57865011 100644 --- a/ansible_galaxy_cli/cli/galaxy.py +++ b/ansible_galaxy_cli/cli/galaxy.py @@ -40,6 +40,7 @@ from ansible_galaxy import matchers from ansible_galaxy import rest_api +from ansible_galaxy import mazer_version from ansible_galaxy.models.context import GalaxyContext from ansible_galaxy.models.build_context import BuildContext @@ -219,10 +220,21 @@ def run(self): log.debug('galaxy context: %s', galaxy_context) - log.debug('execute action: %s', self.action) log.debug('execute action with options: %s', self.options) log.debug('execute action with args: %s', self.args) + version_info = mazer_version.version_data(config_file_path=self.config_file_path, + cli_version=galaxy_cli_version, + argv=sys.argv) + + log.info('exe="%s" version=%s config_file="%s" collections_path="%s" server=%s action=%s', + version_info['executable_location'], + version_info['version'], + version_info['config_file'], + galaxy_context.collections_path, + galaxy_context.server['url'], + self.action) + return self.execute() def execute_build(self): diff --git a/ansible_galaxy_cli/main.py b/ansible_galaxy_cli/main.py index 84717517..1ad9615e 100644 --- a/ansible_galaxy_cli/main.py +++ b/ansible_galaxy_cli/main.py @@ -59,6 +59,6 @@ def main(args=None): log.error('Uncaught exception, existing with exit code: %s', exit_code) raise - log.debug('exit code: %s', exit_code) + log.info('exit code: %s', exit_code) # do any return code setup we need here return exit_code