mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Report OOM errors better

Browse source
This commit is contained in:
Eelco Dolstra 2013-10-02 14:34:36 +02:00
parent a5fb4b5b7c
commit 28e0742966
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/libmain/shared.cc
View file

@ -303,6 +303,9 @@ int main(int argc, char * * argv)
if (e.prefix() != "" && !showTrace) if (e.prefix() != "" && !showTrace)
printMsg(lvlError, "(use `--show-trace' to show detailed location information)"); printMsg(lvlError, "(use `--show-trace' to show detailed location information)");
return e.status; return e.status;
} catch (std::bad_alloc & e) {
printMsg(lvlError, "error: out of memory");
return 1;
} catch (std::exception & e) { } catch (std::exception & e) {
printMsg(lvlError, format("error: %1%") % e.what()); printMsg(lvlError, format("error: %1%") % e.what());
return 1; return 1;

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

@ -731,6 +731,10 @@ static void processConnection(bool trusted)
if (!errorAllowed) printMsg(lvlError, format("error processing client input: %1%") % e.msg()); if (!errorAllowed) printMsg(lvlError, format("error processing client input: %1%") % e.msg());
stopWork(false, e.msg(), GET_PROTOCOL_MINOR(clientVersion) >= 8 ? e.status : 0); stopWork(false, e.msg(), GET_PROTOCOL_MINOR(clientVersion) >= 8 ? e.status : 0);
if (!errorAllowed) break; if (!errorAllowed) break;
} catch (std::bad_alloc & e) {
if (canSendStderr)
stopWork(false, "Nix daemon out of memory", GET_PROTOCOL_MINOR(clientVersion) >= 8 ? 1 : 0);
throw;
} }
to.flush(); to.flush();
@ -893,7 +897,7 @@ static void daemonLoop()
processConnection(trusted); processConnection(trusted);
} catch (std::exception & e) { } catch (std::exception & e) {
writeToStderr("child error: " + string(e.what()) + "\n"); writeToStderr("unexpected Nix daemon error: " + string(e.what()) + "\n");
} }
exit(0); exit(0);
} }