diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2020-07-08 15:55:19 +0200 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2020-07-08 15:55:19 +0200 |
| commit | 9223603908abaa62711296aa224e1bc3d7fb0a91 (patch) | |
| tree | eec1113798c2c4bef12ce14108e4c1ba225ab2fb /src | |
| parent | 1ab9da915422405452118ebb17b88cdfc90b1e10 (diff) | |
| parent | 16ec7785ca51ee6e7e415657a6ecd30c4ea12861 (diff) | |
Merge remote-tracking branch 'origin/master' into flakes
Diffstat (limited to 'src')
| -rw-r--r-- | src/libstore/daemon.cc | 2 | ||||
| -rw-r--r-- | src/libutil/logging.cc | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/libstore/daemon.cc b/src/libstore/daemon.cc index a8fb62e0a..ebc4d0285 100644 --- 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 index 90c6afe81..832aee783 100644 --- a/src/libutil/logging.cc +++ b/src/libutil/logging.cc @@ -81,7 +81,6 @@ public: log(ei.level, oss.str()); } - void startActivity(ActivityId act, Verbosity lvl, ActivityType type, const std::string & s, const Fields & fields, ActivityId parent) |