Permalink
Browse files

Change minimum (default) log level in PostgreSQL to warning.

  • Loading branch information...
1 parent 8c02918 commit 1efd181f2083e5a42dc218b288720acd5616dd54 @kennyj committed Jun 16, 2012
View
2 activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
@@ -1450,7 +1450,7 @@ def configure_connection
if @config[:encoding]
@connection.set_client_encoding(@config[:encoding])
end
- self.client_min_messages = @config[:min_messages] if @config[:min_messages]
+ self.client_min_messages = @config[:min_messages] || 'warning'
self.schema_search_path = @config[:schema_search_path] || @config[:schema_order]
# Use standard-conforming strings if available so we don't have to do the E'...' dance.
View
4 activerecord/test/cases/adapters/postgresql/connection_test.rb
@@ -21,6 +21,10 @@ def test_encoding
assert_not_nil @connection.encoding
end
+ def test_default_client_min_messages
+ assert_equal "warning", @connection.client_min_messages
+ end
+
# Ensure, we can set connection params using the example of Generic
# Query Optimizer (geqo). It is 'on' per default.
def test_connection_options
View
4 railties/lib/rails/generators/rails/app/templates/config/databases/jdbcpostgresql.yml
@@ -22,8 +22,8 @@ development:
# Minimum log levels, in increasing order:
# debug5, debug4, debug3, debug2, debug1,
# log, notice, warning, error, fatal, and panic
- # The server defaults to notice.
- #min_messages: warning
+ # Defaults to warning.
+ #min_messages: notice
# Warning: The database defined as "test" will be erased and
# re-generated from your development database when you run "rake".
View
4 railties/lib/rails/generators/rails/app/templates/config/databases/postgresql.yml
@@ -35,8 +35,8 @@ development:
# Minimum log levels, in increasing order:
# debug5, debug4, debug3, debug2, debug1,
# log, notice, warning, error, fatal, and panic
- # The server defaults to notice.
- #min_messages: warning
+ # Defaults to warning.
+ #min_messages: notice
# Warning: The database defined as "test" will be erased and
# re-generated from your development database when you run "rake".

0 comments on commit 1efd181

Please sign in to comment.