Change default for --log-progress option from auto to true

Author: joto

docs/osm2pgsql.1

@@ -69,8 +69,9 @@ Set log level (`debug', `info' (default), `warn', or `error').
 .TP
 .B \-\-log\-progress=VALUE
 Enable (\f[C]true\f[]) or disable (\f[C]false\f[]) progress logging.
-The default is \f[C]auto\f[] which will enable progress logging on the
+Setting this to \f[C]auto\f[] will enable progress logging on the
 console and disable it if the output is redirected to a file.
+Default: true.
 .RS
 .RE
 .TP

docs/osm2pgsql.md

@@ -57,9 +57,9 @@ mandatory for short options too.
 :   Set log level ('debug', 'info' (default), 'warn', or 'error').
 
 \--log-progress=VALUE
-:   Enable (`true`) or disable (`false`) progress logging. The default is
-    `auto` which will enable progress logging on the console and disable it
-    if the output is redirected to a file.
+:   Enable (`true`) or disable (`false`) progress logging. Setting this to
+    `auto` will enable progress logging on the console and disable it
+    if the output is redirected to a file. Default: true.
 
 \--log-sql
 :   Enable logging of SQL commands for debugging.

src/logging.hpp

@@ -63,14 +63,14 @@ class logger
     bool show_progress() const noexcept { return m_show_progress; }
 
     void enable_progress() noexcept { m_show_progress = true; }
-
     void disable_progress() noexcept { m_show_progress = false; }
+    void auto_progress() noexcept { m_show_progress = osmium::util::isatty(2); }
 
 private:
     log_level m_current_level = log_level::info;
     bool m_log_sql = false;
     bool m_log_sql_data = false;
-    bool m_show_progress = osmium::util::isatty(2);
+    bool m_show_progress = true;
 
 }; // class logger
 

src/options.cpp

@@ -152,9 +152,9 @@ Logging options:\n\
        --log-level=LEVEL  Set log level ('debug', 'info' (default), 'warn',\n\
                     or 'error').\n\
        --log-progress=VALUE  Enable ('true') or disable ('false') progress\n\
-                    logging. The default is 'auto' which will enable progress\n\
+                    logging. If set to 'auto' osm2pgsql will enable progress\n\
                     logging on the console and disable it if the output is\n\
-                    redirected to a file.\n\
+                    redirected to a file. Default: true.\n\
        --log-sql    Enable logging of SQL commands for debugging.\n\
        --log-sql-data  Enable logging of all data added to the database.\n\
     -v|--verbose    Same as '--log-level=debug'.\n\
@@ -608,13 +608,11 @@ options_t::options_t(int argc, char *argv[]) : options_t()
             break;
         case 401: // --log-progress=VALUE
             if (std::strcmp(optarg, "true") == 0) {
-                log_progress = optarg;
                 get_logger().enable_progress();
             } else if (std::strcmp(optarg, "false") == 0) {
-                log_progress = optarg;
                 get_logger().disable_progress();
             } else if (std::strcmp(optarg, "auto") == 0) {
-                log_progress = optarg;
+                get_logger().auto_progress();
             } else {
                 throw std::runtime_error{
                     "Unknown value for --log-progress option: {}"_format(
@@ -729,10 +727,4 @@ void options_t::check_options()
                 "You have to set the config file with the -S|--style option."};
         }
     }
-
-    if (log_progress.empty() && !get_logger().show_progress()) {
-        log_info("Progress logging disabled because you are not logging to the "
-                 "console.");
-        log_info("  Use --log-progress=true to override this.");
-    }
 }

src/options.hpp

@@ -137,7 +137,6 @@ class options_t
     database_options_t database_options;
     std::string output_backend{"pgsql"};
     std::string input_format; ///< input file format (default: autodetect)
-    std::string log_progress; ///< setting of the --log-progress option
     osmium::Box bbox;
     bool extra_attributes = false;