Merge pull request #1943 from joto/client-min-messages

lonvia · web-flow · commit 344e9d8bc39a · 2023-03-06T09:09:56.000+01:00
Do "SET client_min_messages = WARNING" on all db connections
diff --git a/src/db-copy.cpp b/src/db-copy.cpp
@@ -131,10 +131,6 @@ void db_copy_thread_t::thread_t::operator()()
         // Let commits happen faster by delaying when they actually occur.
         m_conn->exec("SET synchronous_commit = off");
 
-        // Do not show messages about invalid geometries (they are removed
-        // by the trigger).
-        m_conn->exec("SET client_min_messages = WARNING");
-
         bool done = false;
         while (!done) {
             std::unique_ptr<db_cmd_t> item;
diff --git a/src/flex-table.cpp b/src/flex-table.cpp
@@ -272,16 +272,13 @@ void table_connection_t::start(bool append)
 {
     assert(m_db_connection);
 
-    m_db_connection->exec("SET client_min_messages = WARNING");
-
     if (!append) {
         m_db_connection->exec("DROP TABLE IF EXISTS {} CASCADE",
                               table().full_name());
     }
 
     // These _tmp tables can be left behind if we run out of disk space.
     m_db_connection->exec("DROP TABLE IF EXISTS {}", table().full_tmp_name());
-    m_db_connection->exec("RESET client_min_messages");
 
     if (!append) {
         m_db_connection->exec(table().build_sql_create_table(
@@ -314,10 +311,6 @@ void table_connection_t::stop(bool updateable, bool append)
 
         log_info("Clustering table '{}' by geometry...", table().name());
 
-        // Notices about invalid geometries are expected and can be ignored
-        // because they say nothing about the validity of the geometry in OSM.
-        m_db_connection->exec("SET client_min_messages = WARNING");
-
         m_db_connection->exec(table().build_sql_create_table(
             flex_table_t::table_type::permanent, table().full_tmp_name()));
 
diff --git a/src/middle-pgsql.cpp b/src/middle-pgsql.cpp
@@ -663,7 +663,6 @@ void middle_pgsql_t::start()
             }
         }
     } else {
-        m_db_connection.exec("SET client_min_messages = WARNING");
         for (auto const &table : m_tables) {
             log_debug("Setting up table '{}'", table.name());
             auto const qual_name = qualified_name(table.schema(), table.name());
diff --git a/src/output-flex.cpp b/src/output-flex.cpp
@@ -1265,7 +1265,6 @@ create_expire_tables(std::vector<expire_output_t> const &expire_outputs,
     }
 
     pg_conn_t const connection{conninfo};
-    connection.exec("SET client_min_messages = WARNING");
     for (auto &expire_output : expire_outputs) {
         if (!expire_output.table().empty()) {
             expire_output.create_output_table(connection);
diff --git a/src/pgsql.cpp b/src/pgsql.cpp
@@ -43,6 +43,12 @@ pg_conn_t::pg_conn_t(std::string const &conninfo)
         log_sql("(C{}) New database connection (backend_pid={})",
                 m_connection_id, results.get(0, 0));
     }
+
+    // PostgreSQL sends notices in many different contexts which aren't that
+    // useful for the user. So we disable them for all connections.
+    if (!get_logger().debug_enabled()) {
+        exec("SET client_min_messages = WARNING");
+    }
 }
 
 void pg_conn_t::close()
diff --git a/src/table.cpp b/src/table.cpp
@@ -84,7 +84,6 @@ void table_t::start(std::string const &conninfo, std::string const &table_space)
 
     connect();
     log_info("Setting up table '{}'", m_target->name);
-    m_sql_conn->exec("SET client_min_messages = WARNING");
     auto const qual_name = qualified_name(m_target->schema, m_target->name);
     auto const qual_tmp_name = qualified_name(
         m_target->schema, m_target->name + "_tmp");
@@ -96,7 +95,6 @@ void table_t::start(std::string const &conninfo, std::string const &table_space)
 
     // These _tmp tables can be left behind if we run out of disk space.
     m_sql_conn->exec("DROP TABLE IF EXISTS {}", qual_tmp_name);
-    m_sql_conn->exec("RESET client_min_messages");
 
     //making a new table
     if (!m_append) {
@@ -197,10 +195,6 @@ void table_t::stop(bool updateable, bool enable_hstore_index,
 
         log_info("Clustering table '{}' by geometry...", m_target->name);
 
-        // Notices about invalid geometries are expected and can be ignored
-        // because they say nothing about the validity of the geometry in OSM.
-        m_sql_conn->exec("SET client_min_messages = WARNING");
-
         std::string sql = fmt::format("CREATE TABLE {} {} AS SELECT * FROM {}",
                                       qual_tmp_name, m_table_space, qual_name);
 

Original file line number	Diff line number	Diff line change
`@@ -663,7 +663,6 @@ void middle_pgsql_t::start()`
`663`	`663`	`}`
`664`	`664`	`}`
`665`	`665`	`} else {`
`666`		`- m_db_connection.exec("SET client_min_messages = WARNING");`
`667`	`666`	`for (auto const &table : m_tables) {`
`668`	`667`	`log_debug("Setting up table '{}'", table.name());`
`669`	`668`	`auto const qual_name = qualified_name(table.schema(), table.name());`
Original file line number	Diff line number	Diff line change
`@@ -1265,7 +1265,6 @@ create_expire_tables(std::vector<expire_output_t> const &expire_outputs,`
`1265`	`1265`	`}`
`1266`	`1266`
`1267`	`1267`	`pg_conn_t const connection{conninfo};`
`1268`		`- connection.exec("SET client_min_messages = WARNING");`
`1269`	`1268`	`for (auto &expire_output : expire_outputs) {`
`1270`	`1269`	`if (!expire_output.table().empty()) {`
`1271`	`1270`	`expire_output.create_output_table(connection);`
Original file line number	Diff line number	Diff line change
`@@ -43,6 +43,12 @@ pg_conn_t::pg_conn_t(std::string const &conninfo)`
`43`	`43`	`log_sql("(C{}) New database connection (backend_pid={})",`
`44`	`44`	`m_connection_id, results.get(0, 0));`
`45`	`45`	`}`
	`46`	`+`
	`47`	`+ // PostgreSQL sends notices in many different contexts which aren't that`
	`48`	`+ // useful for the user. So we disable them for all connections.`
	`49`	`+ if (!get_logger().debug_enabled()) {`
	`50`	`+ exec("SET client_min_messages = WARNING");`
	`51`	`+ }`
`46`	`52`	`}`
`47`	`53`
`48`	`54`	`void pg_conn_t::close()`