External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-15 05:17:36 -02:30
Code Issues Packages Projects Releases Wiki Activity

Reword errors when version metadata does not match or is absent

Browse Source
This commit is contained in:
Matthew Jones
2014-11-18 12:06:25 -05:00
parent 8b46bc3829
commit 3764bd2303
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
awx/wsgi.py
View File

@@ -22,11 +22,10 @@ logger = logging.getLogger('awx.main.models.jobs')
try: try:
fd = open("/var/lib/awx/.tower_version", "r") fd = open("/var/lib/awx/.tower_version", "r")
if fd.read().strip() != tower_version: if fd.read().strip() != tower_version:
logger.error("Tower Versions don't match, potential invalid setup detected") raise Exception()
raise Exception("Tower Versions don't match, potential invalid setup detected")
except Exception: except Exception:
logger.error("Missing tower version metadata at /var/lib/awx/.tower_version") logger.error("Missing or incorrect metadata for Tower version. Ensure Tower was installed using the setup playbook.")
raise Exception("Missing tower version metadata at /var/lib/awx/.tower_version") raise Exception("Missing or incorrect metadata for Tower version. Ensure Tower was installed using the setup playbook.")
# Return the default Django WSGI application. # Return the default Django WSGI application.
from django.core.wsgi import get_wsgi_application from django.core.wsgi import get_wsgi_application