diff --git a/.gitignore b/.gitignore
index 7dfd4366a5..264b4019af 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,7 +5,7 @@ vendor
 .venv
 .tox
 keystone.egg-info/
-run_tests.log
+*.log
 .coverage
 covhtml
 pep8.txt
diff --git a/etc/keystone.conf b/etc/keystone.conf
index 4e20761969..bcb6a6aefd 100644
--- a/etc/keystone.conf
+++ b/etc/keystone.conf
@@ -6,7 +6,7 @@ admin_token = ADMIN
 compute_port = 8774
 verbose = True
 debug = True
-#log_config = /etc/keystone/logging.conf
+#log_config = ./etc/logging.conf.sample
 
 # ================= Syslog Options ============================
 # Send logs to syslog (/dev/log) instead of to file specified
diff --git a/etc/logging.conf.sample b/etc/logging.conf.sample
index 6e3d1a042b..d87d3a28d2 100644
--- a/etc/logging.conf.sample
+++ b/etc/logging.conf.sample
@@ -1,5 +1,5 @@
 [loggers]
-keys=root,api,registry,combined
+keys=root
 
 [formatters]
 keys=normal,normal_with_name,debug
@@ -8,23 +8,8 @@ keys=normal,normal_with_name,debug
 keys=production,file,devel
 
 [logger_root]
-level=NOTSET
-handlers=devel
-
-[logger_api]
-level=DEBUG
-handlers=devel
-qualname=glance-api
-
-[logger_registry]
-level=DEBUG
-handlers=devel
-qualname=glance-registry
-
-[logger_combined]
-level=DEBUG
-handlers=devel
-qualname=glance-combined
+level=WARNING
+handlers=file
 
 [handler_production]
 class=handlers.SysLogHandler
@@ -36,7 +21,7 @@ args=(('localhost', handlers.SYSLOG_UDP_PORT), handlers.SysLogHandler.LOG_USER)
 class=FileHandler
 level=DEBUG
 formatter=normal_with_name
-args=('glance.log', 'w')
+args=('keystone.log', 'a')
 
 [handler_devel]
 class=StreamHandler