From 6f43875e803f4ce46bf4384daf984511b67d881a Mon Sep 17 00:00:00 2001
From: Ryan Petrello <rpetrell@redhat.com>
Date: Fri, 15 Feb 2019 14:30:27 -0500
Subject: [PATCH] record profile data in /var/log/tower, not /var/lib/awx

---
 awx/main/db/profiled_pg/base.py             | 2 +-
 awx/main/management/commands/profile_sql.py | 2 +-
 awx/main/middleware.py                      | 2 +-
 tools/docker-compose/Dockerfile             | 2 +-
 tools/sosreport/tower.py                    | 3 ++-
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/awx/main/db/profiled_pg/base.py b/awx/main/db/profiled_pg/base.py
index 2419435d72..820e867508 100644
--- a/awx/main/db/profiled_pg/base.py
+++ b/awx/main/db/profiled_pg/base.py
@@ -17,7 +17,7 @@ __all__ = ['DatabaseWrapper']
 
 class RecordedQueryLog(object):
 
-    def __init__(self, log, db, dest='/var/lib/awx/profile'):
+    def __init__(self, log, db, dest='/var/log/tower/profile'):
         self.log = log
         self.db = db
         self.dest = dest
diff --git a/awx/main/management/commands/profile_sql.py b/awx/main/management/commands/profile_sql.py
index cfd79ad815..bbcf10dd27 100644
--- a/awx/main/management/commands/profile_sql.py
+++ b/awx/main/management/commands/profile_sql.py
@@ -6,7 +6,7 @@ from awx.main.tasks import profile_sql
 class Command(BaseCommand):
     """
     Enable or disable SQL Profiling across all Python processes.
-    SQL profile data will be recorded at /var/lib/awx/profile/
+    SQL profile data will be recorded at /var/log/tower/profile
     """
 
     def add_arguments(self, parser):
diff --git a/awx/main/middleware.py b/awx/main/middleware.py
index 329a619144..ed1b867c80 100644
--- a/awx/main/middleware.py
+++ b/awx/main/middleware.py
@@ -34,7 +34,7 @@ perf_logger = logging.getLogger('awx.analytics.performance')
 
 class TimingMiddleware(threading.local):
 
-    dest = '/var/lib/awx/profile'
+    dest = '/var/log/tower/profile'
 
     def process_request(self, request):
         self.start_time = time.time()
diff --git a/tools/docker-compose/Dockerfile b/tools/docker-compose/Dockerfile
index 8472bd9aa2..49b7828952 100644
--- a/tools/docker-compose/Dockerfile
+++ b/tools/docker-compose/Dockerfile
@@ -66,7 +66,7 @@ ENTRYPOINT ["/tini", "--"]
 CMD /start_development.sh
 
 # Pre-create things that we need to write to
-RUN for dir in /var/lib/awx/ /projects /.ansible /var/log/nginx /var/lib/nginx /.local; \
+RUN for dir in /var/lib/awx/ /var/log/tower/ /projects /.ansible /var/log/nginx /var/lib/nginx /.local; \
   do mkdir -p $dir; chmod -R g+rwx $dir; chgrp -R root $dir; done
 
 RUN for file in /etc/passwd /etc/supervisord.conf \
diff --git a/tools/sosreport/tower.py b/tools/sosreport/tower.py
index 1c3e02bccf..10d41d6efd 100644
--- a/tools/sosreport/tower.py
+++ b/tools/sosreport/tower.py
@@ -46,7 +46,8 @@ SOSREPORT_FORBIDDEN_PATHS = [
     "/etc/tower/tower.key",
     "/etc/tower/awx.key",
     "/etc/tower/tower.cert",
-    "/etc/tower/awx.cert"
+    "/etc/tower/awx.cert",
+    "/var/log/tower/profile"
 ]
 
 if LooseVersion(sos.__version__) >= LooseVersion('3.0'):