External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-10 22:19:28 -02:30
Code Issues Packages Projects Releases Wiki Activity

consolidate a few license code function calls

Browse Source
This commit is contained in:
Ryan Petrello
2020-10-23 11:04:50 -04:00
parent be4e4ff47c
commit 1294efdeb9
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx/api/generics.py
View File

@@ -187,7 +187,7 @@ class APIView(views.APIView):
''' '''
Log warning for 400 requests. Add header with elapsed time. Log warning for 400 requests. Add header with elapsed time.
''' '''
from awx.main.utils.common import get_licenser from awx.conf.license import get_license
# #
# If the URL was rewritten, and we get a 404, we should entirely # If the URL was rewritten, and we get a 404, we should entirely
@@ -224,7 +224,7 @@ class APIView(views.APIView):
response = super(APIView, self).finalize_response(request, response, *args, **kwargs) response = super(APIView, self).finalize_response(request, response, *args, **kwargs)
time_started = getattr(self, 'time_started', None) time_started = getattr(self, 'time_started', None)
response['X-API-Product-Version'] = get_awx_version() response['X-API-Product-Version'] = get_awx_version()
response['X-API-Product-Name'] = 'AWX' if get_licenser().validate().get('license_type') == 'open' else 'Red Hat Ansible Tower' response['X-API-Product-Name'] = 'AWX' if get_license().get('license_type') == 'open' else 'Red Hat Ansible Tower'
response['X-API-Node'] = settings.CLUSTER_HOST_ID response['X-API-Node'] = settings.CLUSTER_HOST_ID
if time_started: if time_started:

4
awx/conf/license.py
View File

@@ -5,8 +5,8 @@ __all__ = ['get_license']
def _get_validated_license_data(): def _get_validated_license_data():
from awx.main.utils.licensing import Licenser from awx.main.utils import get_licenser
return Licenser().validate() return get_licenser().validate()
def get_license(): def get_license():