summaryrefslogtreecommitdiffstats
path: root/test/functional/conf
diff options
context:
space:
mode:
Diffstat (limited to 'test/functional/conf')
-rw-r--r--test/functional/conf/account-server.conf3
-rw-r--r--test/functional/conf/container-server.conf3
-rw-r--r--test/functional/conf/object-server.conf3
-rw-r--r--test/functional/conf/proxy-server.conf9
-rw-r--r--test/functional/conf/swift.conf6
5 files changed, 14 insertions, 10 deletions
diff --git a/test/functional/conf/account-server.conf b/test/functional/conf/account-server.conf
index 3290cf2..5a74220 100644
--- a/test/functional/conf/account-server.conf
+++ b/test/functional/conf/account-server.conf
@@ -24,11 +24,12 @@ pipeline = account-server
use = egg:gluster_swift#account
user = root
log_facility = LOG_LOCAL2
+log_level = WARN
#
# After ensuring things are running in a stable manner, you can turn off
# normal request logging for the account server to unclutter the log
# files. Warnings and errors will still be logged.
-log_requests = on
+log_requests = off
[account-replicator]
vm_test_mode = yes
diff --git a/test/functional/conf/container-server.conf b/test/functional/conf/container-server.conf
index ad8a447..dde3e23 100644
--- a/test/functional/conf/container-server.conf
+++ b/test/functional/conf/container-server.conf
@@ -24,11 +24,12 @@ pipeline = container-server
use = egg:gluster_swift#container
user = root
log_facility = LOG_LOCAL2
+log_level = WARN
#
# After ensuring things are running in a stable manner, you can turn off
# normal request logging for the container server to unclutter the log
# files. Warnings and errors will still be logged.
-log_requests = on
+log_requests = off
[container-replicator]
vm_test_mode = yes
diff --git a/test/functional/conf/object-server.conf b/test/functional/conf/object-server.conf
index e9088ba..82a78bb 100644
--- a/test/functional/conf/object-server.conf
+++ b/test/functional/conf/object-server.conf
@@ -30,12 +30,13 @@ pipeline = object-server
use = egg:gluster_swift#object
user = root
log_facility = LOG_LOCAL2
+log_level = WARN
#
# For performance, after ensuring things are running in a stable manner, you
# can turn off normal request logging for the object server to reduce the
# per-request overhead and unclutter the log files. Warnings and errors will
# still be logged.
-log_requests = on
+log_requests = off
#
# Adjust this value to match the stripe width of the underlying storage array
# (not the stripe element size). This will provide a reasonable starting point
diff --git a/test/functional/conf/proxy-server.conf b/test/functional/conf/proxy-server.conf
index 54b9814..4b422f4 100644
--- a/test/functional/conf/proxy-server.conf
+++ b/test/functional/conf/proxy-server.conf
@@ -5,11 +5,12 @@ user = root
workers = 1
[pipeline:main]
-pipeline = healthcheck cache tempauth proxy-server
+pipeline = catch_errors healthcheck proxy-logging cache tempauth proxy-logging proxy-server
[app:proxy-server]
use = egg:gluster_swift#proxy
log_facility = LOG_LOCAL1
+log_level = WARN
# The API allows for account creation and deletion, but since Gluster/Swift
# automounts a Gluster volume for a given account, there is no way to create
# or delete an account. So leave this off.
@@ -43,6 +44,12 @@ object_chunk_size = 65536
# for object_chunk_size.
put_queue_depth = 10
+[filter:catch_errors]
+use = egg:swift#catch_errors
+
+[filter:proxy-logging]
+use = egg:swift#proxy_logging
+
[filter:healthcheck]
use = egg:swift#healthcheck
diff --git a/test/functional/conf/swift.conf b/test/functional/conf/swift.conf
index 25c3ca1..d69eefa 100644
--- a/test/functional/conf/swift.conf
+++ b/test/functional/conf/swift.conf
@@ -17,12 +17,6 @@ swift_hash_path_suffix = gluster
# This value is set in bytes. Setting it to lower than 1MiB will cause
# some tests to fail. It is STRONGLY recommended to leave this value at
# the default (5 * 2**30 + 2).
-
-# FIXME: Really? Gluster can handle a 2^64 sized file? And can the fronting
-# web service handle such a size? I think with UFO, we need to keep with the
-# default size from Swift and encourage users to research what size their web
-# services infrastructure can handle.
-
max_file_size = 18446744073709551616