diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2020-04-09 15:54:21 +0200 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2020-04-09 15:54:21 +0200 |
| commit | d103c79144723d95eb3650593ad4d3e96abe59d3 (patch) | |
| tree | 44bc23261fe42a60afa666ab770cf8d7f55c5138 /src/libutil | |
| parent | 03a4a3c95cf0e10cd05c1c4ce9dd35c9fc64c331 (diff) | |
| parent | 30d4618cc944a41c2ca202babd0be0da4a1cd9d2 (diff) | |
Merge remote-tracking branch 'origin/master' into flakes
Diffstat (limited to 'src/libutil')
| -rw-r--r-- | src/libutil/logging.cc | 2 | ||||
| -rw-r--r-- | src/libutil/logging.hh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/libutil/logging.cc b/src/libutil/logging.cc index fa5c84a27..bb437cf1c 100644 --- a/src/libutil/logging.cc +++ b/src/libutil/logging.cc @@ -198,7 +198,7 @@ bool handleJSONLogMessage(const std::string & msg, if (action == "start") { auto type = (ActivityType) json["type"]; - if (trusted || type == actDownload) + if (trusted || type == actFileTransfer) activities.emplace(std::piecewise_construct, std::forward_as_tuple(json["id"]), std::forward_as_tuple(*logger, (Verbosity) json["level"], type, diff --git a/src/libutil/logging.hh b/src/libutil/logging.hh index beb5e6b64..108b5dcb0 100644 --- a/src/libutil/logging.hh +++ b/src/libutil/logging.hh @@ -17,7 +17,7 @@ typedef enum { typedef enum { actUnknown = 0, actCopyPath = 100, - actDownload = 101, + actFileTransfer = 101, actRealise = 102, actCopyPaths = 103, actBuilds = 104, |