Kinesin/daggy
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixing issue with daggyd config parsing

Browse Source
This commit is contained in:
Ian Roddis
2022-01-28 13:28:29 -04:00
parent c9820c19a0
commit cbd493ec38
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
daggyd/daggyd/daggyd.cpp
View File

@@ -209,6 +209,7 @@ std::unique_ptr<de::TaskExecutor> executorFactory(const rj::Value &config)
"DaggyRunnerExecutor runners must be an array of urls"); "DaggyRunnerExecutor runners must be an array of urls");
exe->addRunner(runners[i].GetString()); exe->addRunner(runners[i].GetString());
} }
return exe;
} }
else if (name == "SSHTaskExecutor") { else if (name == "SSHTaskExecutor") {
if (!execConfig.HasMember("hosts")) if (!execConfig.HasMember("hosts"))
@@ -251,7 +252,7 @@ std::unique_ptr<de::TaskExecutor> executorFactory(const rj::Value &config)
return exe; return exe;
} }
throw std::runtime_error("Unknown executor type: " + name); throw std::runtime_error("Unknown executor type: >>" + name + "<<");
} }
int main(int argc, char **argv) int main(int argc, char **argv)

1
libdaggy/src/executors/task/DaggyRunnerTaskExecutor.cpp
View File

@@ -88,6 +88,7 @@ DaggyRunnerTaskExecutor::~DaggyRunnerTaskExecutor()
{ {
running_ = false; running_ = false;
monitorWorker_.join(); monitorWorker_.join();
dispatchWorker_.join();
} }
std::string DaggyRunnerTaskExecutor::description() const std::string DaggyRunnerTaskExecutor::description() const