Fix: Add return character before logging when progress display is shown

When there is an active progress display, log messages would show up
after the progress display instead of the next line.

Fixes #1570

Author: joto

src/logging.hpp

@@ -39,17 +39,23 @@ class logger
 public:
     template <typename S, typename... TArgs>
     void log(log_level with_level, char const *prefix,
-             fmt::text_style const &style, S const &format_str,
-             TArgs &&... args) const
+             fmt::text_style const &style, S const &format_str, TArgs &&...args)
     {
         if (with_level < m_current_level) {
             return;
         }
 
         auto const &ts = m_use_color ? style : fmt::text_style{};
 
-        std::string str = fmt::format("{:%Y-%m-%d %H:%M:%S}  ",
-                                      fmt::localtime(std::time(nullptr)));
+        std::string str;
+
+        if (m_needs_leading_return) {
+            m_needs_leading_return = false;
+            str += '\n';
+        }
+
+        str += fmt::format("{:%Y-%m-%d %H:%M:%S}  ",
+                           fmt::localtime(std::time(nullptr)));
 
         if (m_current_level == log_level::debug) {
             str += fmt::format(ts, "[{}] ", this_thread_num);
@@ -81,11 +87,15 @@ class logger
     void disable_progress() noexcept { m_show_progress = false; }
     void auto_progress() noexcept { m_show_progress = osmium::util::isatty(2); }
 
+    void needs_leading_return() noexcept { m_needs_leading_return = true; }
+    void no_leading_return() noexcept { m_needs_leading_return = false; }
+
 private:
     log_level m_current_level = log_level::info;
     bool m_log_sql = false;
     bool m_log_sql_data = false;
     bool m_show_progress = true;
+    bool m_needs_leading_return = false;
 
 #ifdef _WIN32
     bool m_use_color = false;
@@ -129,7 +139,7 @@ void log_error(S const &format_str, TArgs &&... args)
 template <typename S, typename... TArgs>
 void log_sql(S const &format_str, TArgs &&... args)
 {
-    auto const &logger = get_logger();
+    auto &logger = get_logger();
     if (logger.log_sql()) {
         logger.log(log_level::error, "SQL", fg(fmt::color::blue), format_str,
                    std::forward<TArgs>(args)...);
@@ -139,7 +149,7 @@ void log_sql(S const &format_str, TArgs &&... args)
 template <typename S, typename... TArgs>
 void log_sql_data(S const &format_str, TArgs &&... args)
 {
-    auto const &logger = get_logger();
+    auto &logger = get_logger();
     if (logger.log_sql_data()) {
         logger.log(log_level::error, "SQL", {}, format_str,
                    std::forward<TArgs>(args)...);

src/progress-display.cpp

@@ -40,6 +40,7 @@ void progress_display_t::print_summary() const
     std::time_t const now = std::time(nullptr);
 
     if (m_enabled) {
+        get_logger().no_leading_return();
         fmt::print(stderr, "\r{:90s}\r", "");
     }
 
@@ -62,6 +63,7 @@ void progress_display_t::print_summary() const
 void progress_display_t::print_status(std::time_t now) const
 {
     if (m_enabled) {
+        get_logger().needs_leading_return();
         fmt::print(stderr,
                    "\rProcessing: Node({}k {:.1f}k/s) Way({}k {:.2f}k/s)"
                    " Relation({} {:.1f}/s)",