qyriad/lix
1
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

appending to hints; remove _printError

Browse source
This commit is contained in:
Ben Burdette 2020-05-04 16:19:57 -06:00
parent f30de61578
commit 7ffb5efdbc
4 changed files with 18 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/error-demo/error-demo.cc
View file

@ -26,10 +26,13 @@ int main()
// ErrorInfo constructor // ErrorInfo constructor
try { try {
auto e = Error("generic error"); auto e = Error("some error");
throw DemoError(e.info()); throw DemoError(e.info());
} catch (Error &e) { } catch (Error &e) {
logger->logEI(e.info()); ErrorInfo ei = e.info();
string prevhint = (e.info().hint.has_value() ? e.info().hint->str() : "");
ei.hint = std::optional(hintfmt("previous hint was: %s", normaltxt(prevhint)));
logger->logEI(ei);
} }

12
src/libstore/build.cc
View file

@ -488,14 +488,18 @@ void handleDiffHook(
auto diffRes = runProgram(diffHookOptions); auto diffRes = runProgram(diffHookOptions);
if (!statusOk(diffRes.first)) if (!statusOk(diffRes.first))
throw ExecError(diffRes.first, "diff-hook program '%1%' %2%", diffHook, statusToString(diffRes.first)); throw ExecError(diffRes.first,
"diff-hook program '%1%' %2%",
diffHook,
statusToString(diffRes.first));
if (diffRes.second != "") if (diffRes.second != "")
printError(chomp(diffRes.second)); printError(chomp(diffRes.second));
} catch (Error & error) { } catch (Error & error) {
// logError(error.info()) ErrorInfo ei = error.info();
// TODO append message onto errorinfo... string prevhint = (error.info().hint.has_value() ? error.info().hint->str() : "");
_printError("diff hook execution failed: %s", error.what()); ei.hint = std::optional(hintfmt("diff hook execution failed: %s", prevhint));
logError(ei);
} }
} }
} }

1
src/libutil/logging.hh
View file

@ -149,7 +149,6 @@ extern Verbosity verbosity; /* suppress msgs > this */
} \ } \
} while (0) } while (0)
#define _printError(args...) printMsg(lvlError, args)
#define printError(args...) printMsg(lvlError, args) #define printError(args...) printMsg(lvlError, args)
#define printInfo(args...) printMsg(lvlInfo, args) #define printInfo(args...) printMsg(lvlInfo, args)
#define printTalkative(args...) printMsg(lvlTalkative, args) #define printTalkative(args...) printMsg(lvlTalkative, args)

7
src/nix-daemon/nix-daemon.cc
View file

@ -246,9 +246,12 @@ static void daemonLoop(char * * argv)
} catch (Interrupted & e) { } catch (Interrupted & e) {
return; return;
} catch (Error & e) { } catch (Error & error) {
// TODO append error message // TODO append error message
_printError("error processing connection: %1%", e.msg()); ErrorInfo ei = error.info();
string prevhint = (error.info().hint.has_value() ? error.info().hint->str() : "");
ei.hint = std::optional(hintfmt("error processing connection: %1%", prevhint));
logError(ei);
} }
} }
} }