From ec2a3553cd1fcc5eb3876b121d5ab729926ae7ad Mon Sep 17 00:00:00 2001
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: Thu, 13 Sep 2018 14:35:14 +0200
Subject: [PATCH] exception_store: rename .ini option for future

---
 configs/development.ini        | 14 +-------------
 configs/production.ini         | 13 +------------
 rhodecode/config/middleware.py |  2 +-
 rhodecode/lib/exc_tracking.py  |  2 +-
 4 files changed, 4 insertions(+), 27 deletions(-)

diff --git a/configs/development.ini b/configs/development.ini
index 624efc84..0e5a7c6a 100644
--- a/configs/development.ini
+++ b/configs/development.ini
@@ -20,17 +20,6 @@ debug = true
 ## email FROM address all mails will be sent
 #app_email_from = rhodecode-noreply@localhost
 
-## Uncomment and replace with the address which should receive any error report
-## note: using appenlight for error handling doesn't need this to be uncommented
-#email_to = admin@localhost
-
-## in case of Application errors, sent an error email form
-#error_email_from = rhodecode_error@localhost
-
-## additional error message to be send in case of server crash
-#error_message =
-
-
 #smtp_server = mail.server.com
 #smtp_username =
 #smtp_password =
@@ -293,8 +282,7 @@ supervisor.group_id = dev
 labs_settings_active = true
 
 ## custom exception store path, defaults to TMPDIR
-exception_store_path =
-
+exception_tracker.store_path =
 
 ####################################
 ###        CELERY CONFIG        ####
diff --git a/configs/production.ini b/configs/production.ini
index 9a0986ae..058e9a97 100644
--- a/configs/production.ini
+++ b/configs/production.ini
@@ -20,17 +20,6 @@ debug = true
 ## email FROM address all mails will be sent
 #app_email_from = rhodecode-noreply@localhost
 
-## Uncomment and replace with the address which should receive any error report
-## note: using appenlight for error handling doesn't need this to be uncommented
-#email_to = admin@localhost
-
-## in case of Application errors, sent an error email form
-#error_email_from = rhodecode_error@localhost
-
-## additional error message to be send in case of server crash
-#error_message =
-
-
 #smtp_server = mail.server.com
 #smtp_username =
 #smtp_password =
@@ -268,7 +257,7 @@ supervisor.group_id = prod
 labs_settings_active = true
 
 ## custom exception store path, defaults to TMPDIR
-exception_store_path =
+exception_tracker.store_path =
 
 
 ####################################
diff --git a/rhodecode/config/middleware.py b/rhodecode/config/middleware.py
index 2ea487bb..58bdc8d1 100644
--- a/rhodecode/config/middleware.py
+++ b/rhodecode/config/middleware.py
@@ -452,7 +452,7 @@ def _sanitize_cache_settings(settings):
     # exception store cache
     _string_setting(
         settings,
-        'exception_store_path',
+        'exception_tracker.store_path',
         default_cache_dir, lower=False)
 
     # cache_perms
diff --git a/rhodecode/lib/exc_tracking.py b/rhodecode/lib/exc_tracking.py
index de47f06f..368cdda3 100644
--- a/rhodecode/lib/exc_tracking.py
+++ b/rhodecode/lib/exc_tracking.py
@@ -57,7 +57,7 @@ def get_exc_store():
     """
     import rhodecode as app
 
-    exc_store_dir = app.CONFIG.get('exception_store_path', '') or tempfile.gettempdir()
+    exc_store_dir = app.CONFIG.get('exception_tracker.store_path', '') or tempfile.gettempdir()
     _exc_store_path = os.path.join(exc_store_dir, exc_store_dir_name)
 
     _exc_store_path = os.path.abspath(_exc_store_path)