Merge remote-tracking branch 'origin/master' into flakes

NixOS · Jul 8, 2020 · 9223603 · 9223603
2 parents 1ab9da9 + 16ec778
commit 9223603
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/src/libstore/daemon.cc b/src/libstore/daemon.cc
@@ -81,7 +81,7 @@ struct TunnelLogger : public Logger
         showErrorInfo(oss, ei, false);
 
         StringSink buf;
-        buf << STDERR_NEXT << oss.str() << "\n";
+        buf << STDERR_NEXT << oss.str();
         enqueueMsg(*buf.s);
     }
 

diff --git a/src/libutil/logging.cc b/src/libutil/logging.cc
@@ -81,7 +81,6 @@ class SimpleLogger : public Logger
 
         log(ei.level, oss.str());
     }
-
 
     void startActivity(ActivityId act, Verbosity lvl, ActivityType type,
         const std::string & s, const Fields & fields, ActivityId parent)
-Original file line number
+Diff line change
@@ Expand Up / @@ -81,7 +81,6 @@ class SimpleLogger : public Logger @@
             log(ei.level, oss.str());
         }
         void startActivity(ActivityId act, Verbosity lvl, ActivityType type,
             const std::string & s, const Fields & fields, ActivityId parent)
@@ Expand Down @@