abonerib/nix-serve-ng
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix /log/ endpoint

Browse Source 
The old logic would fail to return a result if a later
substituter didn't have the log file, even if an older

This also simplifies the logic.
This commit is contained in:
Gabriella Gonzalez
2022-07-01 12:29:28 -07:00
parent c8d0b47a7a
commit dbf735e77f
3 changed files with 37 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
cbits/nix.cpp
View File

@@ -176,30 +176,26 @@ void dumpPath(char const * const hashPart, struct string * const output) {
}
}
void dumpLog(char const * const hashPart, struct string * const output) {
void dumpLog(char const * const baseName, struct string * const output) {
ref<Store> store = getStore();
std::optional<StorePath> storePath =
store->queryPathFromHashPart(hashPart);
StorePath storePath(baseName);
if (storePath.has_value()) {
auto subs = getDefaultSubstituters();
auto subs = getDefaultSubstituters();
subs.push_front(store);
subs.push_front(store);
for (auto & sub : subs) {
LogStore * logStore = dynamic_cast<LogStore *>(&*sub);
*output = emptyString;
std::optional<std::string> log = logStore->getBuildLog(storePath.value());
for (auto & sub : subs) {
LogStore * logStore = dynamic_cast<LogStore *>(&*sub);
if (log.has_value()) {
copyString(log.value(), output);
} else {
*output = emptyString;
}
std::optional<std::string> log = logStore->getBuildLog(storePath);
if (log.has_value()) {
copyString(log.value(), output);
}
} else {
*output = emptyString;
}
}
}