From 7870feb3da2212ee540aacd6cbc0117b130176df Mon Sep 17 00:00:00 2001
From: Martin Bornhold <martin@rhodecode.com>
Date: Tue, 4 Oct 2016 15:07:10 +0200
Subject: [PATCH] tests: Create new config files for vcsserver (http/pyro4)

---
 ...sserver_pyramid.ini => vcsserver_http.ini} | 27 ++++++++++++++-----
 .../{vcsserver.ini => vcsserver_pyro4.ini}    | 16 +----------
 2 files changed, 21 insertions(+), 22 deletions(-)
 rename rhodecode/tests/{vcsserver_pyramid.ini => vcsserver_http.ini} (71%)
 rename rhodecode/tests/{vcsserver.ini => vcsserver_pyro4.ini} (84%)

diff --git a/rhodecode/tests/vcsserver_pyramid.ini b/rhodecode/tests/vcsserver_http.ini
similarity index 71%
rename from rhodecode/tests/vcsserver_pyramid.ini
rename to rhodecode/tests/vcsserver_http.ini
index aecc2ecd..477c221f 100644
--- a/rhodecode/tests/vcsserver_pyramid.ini
+++ b/rhodecode/tests/vcsserver_http.ini
@@ -1,8 +1,18 @@
+################################################################################
+# RhodeCode VCSServer with HTTP Backend - configuration                        #
+#                                                                              #
+################################################################################
+
 [app:main]
 use = egg:rhodecode-vcsserver
-pyramid.reload_templates = true
+
 pyramid.default_locale_name = en
 pyramid.includes =
+pyramid.reload_templates = true
+
+# default locale used by VCS systems
+locale = en_US.UTF-8
+
 # cache regions, please don't change
 beaker.cache.regions = repo_object
 beaker.cache.repo_object.type = memorylru
@@ -10,20 +20,17 @@ beaker.cache.repo_object.max_items = 100
 # cache auto-expires after N seconds
 beaker.cache.repo_object.expire = 300
 beaker.cache.repo_object.enabled = true
-locale = en_US.UTF-8
-
 
 [server:main]
 use = egg:waitress#main
-host = 0.0.0.0
+host = 127.0.0.1
 port = %(http_port)s
 
-
 ################################
 ### LOGGING CONFIGURATION   ####
 ################################
 [loggers]
-keys = root, vcsserver, beaker
+keys = root, vcsserver, pyro4, beaker
 
 [handlers]
 keys = console
@@ -50,6 +57,12 @@ handlers =
 qualname = beaker
 propagate = 1
 
+[logger_pyro4]
+level = DEBUG
+handlers =
+qualname = Pyro4
+propagate = 1
+
 
 ##############
 ## HANDLERS ##
@@ -58,7 +71,7 @@ propagate = 1
 [handler_console]
 class = StreamHandler
 args = (sys.stderr,)
-level = DEBUG
+level = INFO
 formatter = generic
 
 ################
diff --git a/rhodecode/tests/vcsserver.ini b/rhodecode/tests/vcsserver_pyro4.ini
similarity index 84%
rename from rhodecode/tests/vcsserver.ini
rename to rhodecode/tests/vcsserver_pyro4.ini
index 12bb1029..1bc8b987 100644
--- a/rhodecode/tests/vcsserver.ini
+++ b/rhodecode/tests/vcsserver_pyro4.ini
@@ -5,7 +5,7 @@
 
 [DEFAULT]
 host = 127.0.0.1
-port = 9901
+port = 9900
 locale = en_US.UTF-8
 # number of worker threads, this should be set based on a formula threadpool=N*6
 # where N is number of RhodeCode Enterprise workers, eg. running 2 instances
@@ -70,20 +70,6 @@ args = (sys.stderr,)
 level = INFO
 formatter = generic
 
-[handler_file]
-class = FileHandler
-args = ('vcsserver.log', 'a',)
-level = DEBUG
-formatter = generic
-
-[handler_file_rotating]
-class = logging.handlers.TimedRotatingFileHandler
-# 'D', 5 - rotate every 5days
-# you can set 'h', 'midnight'
-args = ('vcsserver.log', 'D', 5, 10,)
-level = DEBUG
-formatter = generic
-
 ################
 ## FORMATTERS ##
 ################