util.{hh,cc}: Move ignoreException to error.{hh,cc}

Change-Id: Iae6464217a55c313a983e5c651b26a4a1e446706
This commit is contained in:
Tom Hubrecht 2024-05-28 16:09:33 +02:00
parent 8b6d2d3915
commit 93ebb3e7df
5 changed files with 20 additions and 20 deletions

View file

@ -1,9 +1,9 @@
#include "current-process.hh" #include "current-process.hh"
#include "error.hh"
#include "file-system.hh" #include "file-system.hh"
#include "logging.hh" #include "logging.hh"
#include "namespaces.hh" #include "namespaces.hh"
#include "signals.hh" #include "signals.hh"
#include "util.hh"
#include "strings.hh" #include "strings.hh"
#ifdef __APPLE__ #ifdef __APPLE__

View file

@ -417,4 +417,17 @@ std::ostream & showErrorInfo(std::ostream & out, const ErrorInfo & einfo, bool s
return out; return out;
} }
void ignoreException(Verbosity lvl)
{
/* Make sure no exceptions leave this function.
printError() also throws when remote is closed. */
try {
try {
throw;
} catch (std::exception & e) {
printMsg(lvl, "error (ignored): %1%", e.what());
}
} catch (...) { }
}
} }

View file

@ -202,4 +202,10 @@ public:
} }
}; };
/**
* Exception handling in destructors: print an error message, then
* ignore the exception.
*/
void ignoreException(Verbosity lvl = lvlError);
} }

View file

@ -70,18 +70,6 @@ namespace nix {
void ignoreException(Verbosity lvl)
{
/* Make sure no exceptions leave this function.
printError() also throws when remote is closed. */
try {
try {
throw;
} catch (std::exception & e) {
printMsg(lvl, "error (ignored): %1%", e.what());
}
} catch (...) { }
}
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////

View file

@ -39,13 +39,6 @@ struct Source;
extern const std::string nativeSystem; extern const std::string nativeSystem;
/**
* Exception handling in destructors: print an error message, then
* ignore the exception.
*/
void ignoreException(Verbosity lvl = lvlError);
/** /**
* Get a value for the specified key from an associate container. * Get a value for the specified key from an associate container.