wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-28 17:51:15 +02:00
Code Activity

Merge pull request #6962 from edolstra/unique-ptr-logger

Browse source 
Make 'logger' a std::unique_ptr
This commit is contained in:
Eelco Dolstra 2025-02-18 14:54:44 +01:00 • committed by GitHub
commit 258b5ef80b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
9 changed files with 53 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/libstore/daemon.cc
View file

@ -1041,11 +1041,15 @@ void processConnection(
conn.protoVersion = protoVersion;
conn.features = features;
auto tunnelLogger = new TunnelLogger(conn.to, protoVersion);
auto prevLogger = nix::logger;
auto tunnelLogger_ = std::make_unique<TunnelLogger>(conn.to, protoVersion);
auto tunnelLogger = tunnelLogger_.get();
std::unique_ptr<Logger> prevLogger_;
auto prevLogger = logger.get();
// FIXME
if (!recursive)
logger = tunnelLogger;
if (!recursive) {
prevLogger_ = std::move(logger);
logger = std::move(tunnelLogger_);
}
unsigned int opCount = 0;