Update logging on conf files

BUG 989406: https://bugzilla.redhat.com/show_bug.cgi?id=989406

Change-Id: I777845ec57f9f6fc6aed87de7bea5f01bb69f7c3
Signed-off-by: Luis Pabon <lpabon@redhat.com>
Reviewed-on: http://review.gluster.org/5419

5 files changed, 15 insertions, 10 deletions

diff --git a/etc/account-server.conf-gluster b/etc/account-server.conf-gluster
index 0804605..7d4dd6c 100644
--- a/etc/account-server.conf-gluster
+++ b/etc/account-server.conf-gluster
@@ -22,11 +22,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/etc/container-server.conf-gluster b/etc/container-server.conf-gluster
index a5ae298..c67d7d2 100644
--- a/etc/container-server.conf-gluster
+++ b/etc/container-server.conf-gluster
@@ -22,11 +22,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/etc/object-server.conf-gluster b/etc/object-server.conf-gluster
index cbffe75..21cd27e 100644
--- a/etc/object-server.conf-gluster
+++ b/etc/object-server.conf-gluster
@@ -28,12 +28,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/etc/proxy-server.conf-gluster b/etc/proxy-server.conf-gluster
index 6179014..32182b9 100644
--- a/etc/proxy-server.conf-gluster
+++ b/etc/proxy-server.conf-gluster
@@ -5,11 +5,12 @@ user = root
 workers = 1
 
 [pipeline:main]
-pipeline = healthcheck cache proxy-server
+pipeline = catch_errors healthcheck proxy-logging cache 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,13 @@ 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
+access_log_level = WARN
+
 [filter:healthcheck]
 use = egg:swift#healthcheck
 
diff --git a/etc/swift.conf-gluster b/etc/swift.conf-gluster
index 25c3ca1..d69eefa 100644
--- a/etc/swift.conf-gluster
+++ b/etc/swift.conf-gluster
@@ -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