mirror of
https://github.com/ansible/awx.git
synced 2026-01-11 18:09:57 -03:30
Change import/export logging detection to detect errors vs warnings
This commit is contained in:
parent
cd9838d579
commit
7dfa957619
@ -82,9 +82,11 @@ EXAMPLES = '''
|
||||
- name: Export all tower assets
|
||||
tower_export:
|
||||
all: True
|
||||
|
||||
- name: Export all inventories
|
||||
tower_export:
|
||||
inventory: 'all'
|
||||
|
||||
- name: Export a job template named "My Template" and all Credentials
|
||||
tower_export:
|
||||
job_template: "My Template"
|
||||
@ -135,27 +137,27 @@ def main():
|
||||
# Otherwise we take either the string or None (if the parameter was not passed) to get one or no items
|
||||
export_args[resource] = module.params.get(resource)
|
||||
|
||||
# Currently the import process does not return anything on error
|
||||
# It simply just logs to pythons logger
|
||||
# Setup a log gobbler to get error messages from import_assets
|
||||
# Currently the export process does not return anything on error
|
||||
# It simply just logs to Python's logger
|
||||
# Set up a log gobbler to get error messages from export_assets
|
||||
log_capture_string = StringIO()
|
||||
ch = logging.StreamHandler(log_capture_string)
|
||||
for logger_name in ['awxkit.api.pages.api', 'awxkit.api.pages.page']:
|
||||
logger = logging.getLogger(logger_name)
|
||||
logger.setLevel(logging.WARNING)
|
||||
ch.setLevel(logging.WARNING)
|
||||
logger.setLevel(logging.ERROR)
|
||||
ch.setLevel(logging.ERROR)
|
||||
|
||||
logger.addHandler(ch)
|
||||
log_contents = ''
|
||||
|
||||
# Run the import process
|
||||
# Run the export process
|
||||
try:
|
||||
module.json_output['assets'] = module.get_api_v2_object().export_assets(**export_args)
|
||||
module.exit_json(**module.json_output)
|
||||
except Exception as e:
|
||||
module.fail_json(msg="Failed to export assets {0}".format(e))
|
||||
finally:
|
||||
# Finally consume the logs incase there were any errors and die if there were
|
||||
# Finally, consume the logs in case there were any errors and die if there were
|
||||
log_contents = log_capture_string.getvalue()
|
||||
log_capture_string.close()
|
||||
if log_contents != '':
|
||||
|
||||
@ -38,7 +38,7 @@ EXAMPLES = '''
|
||||
- name: Export all assets
|
||||
tower_export:
|
||||
all: True
|
||||
registeR: export_output
|
||||
register: export_output
|
||||
|
||||
- name: Import all tower assets from our export
|
||||
tower_import:
|
||||
@ -51,7 +51,7 @@ EXAMPLES = '''
|
||||
|
||||
from ..module_utils.tower_awxkit import TowerAWXKitModule
|
||||
|
||||
# These two lines are not needed if awxkit changes to do progamatic notifications on issues
|
||||
# These two lines are not needed if awxkit changes to do programatic notifications on issues
|
||||
from ansible.module_utils.six.moves import StringIO
|
||||
import logging
|
||||
|
||||
@ -76,13 +76,15 @@ def main():
|
||||
module.fail_json(msg="Your version of awxkit does not appear to have import/export")
|
||||
|
||||
# Currently the import process does not return anything on error
|
||||
# It simply just logs to pythons logger
|
||||
# Setup a log gobbler to get error messages from import_assets
|
||||
# It simply just logs to Python's logger
|
||||
# Set up a log gobbler to get error messages from import_assets
|
||||
logger = logging.getLogger('awxkit.api.pages.api')
|
||||
logger.setLevel(logging.WARNING)
|
||||
logger.setLevel(logging.ERROR)
|
||||
|
||||
log_capture_string = StringIO()
|
||||
ch = logging.StreamHandler(log_capture_string)
|
||||
ch.setLevel(logging.WARNING)
|
||||
ch.setLevel(logging.ERROR)
|
||||
|
||||
logger.addHandler(ch)
|
||||
log_contents = ''
|
||||
|
||||
@ -92,7 +94,7 @@ def main():
|
||||
except Exception as e:
|
||||
module.fail_json(msg="Failed to import assets {0}".format(e))
|
||||
finally:
|
||||
# Finally consume the logs incase there were any errors and die if there were
|
||||
# Finally, consume the logs in case there were any errors and die if there were
|
||||
log_contents = log_capture_string.getvalue()
|
||||
log_capture_string.close()
|
||||
if log_contents != '':
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user