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

Making response a JSON object with trailing newline

Browse Source
This commit is contained in:
Ian Roddis
2022-02-23 13:51:01 -04:00
parent 3822426446
commit 0b195da309
1 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
daggyd/libdaggyd/src/Server.cpp
View File

@@ -10,10 +10,10 @@
#include <thread> #include <thread>
#include <utility> #include <utility>
#define REQ_RESPONSE(code, msg) \ #define REQ_RESPONSE(code, msg) \
std::stringstream ss; \ std::stringstream ss; \
ss << R"({"message": )" << std::quoted(msg) << "}"; \ ss << R"({"message": )" << std::quoted(msg) << "}\n"; \
response.send(Pistache::Http::Code::code, ss.str()); \ response.send(Pistache::Http::Code::code, ss.str()); \
return; return;
using namespace Pistache; using namespace Pistache;
@@ -194,22 +194,21 @@ namespace daggy::daggyd {
if (!handleAuth(request)) if (!handleAuth(request))
return; return;
DAGSpec dagSpec; DAGRunID runID = 0;
try { try {
DAGSpec dagSpec;
dagSpec = dagFromJSON(request.body()); dagSpec = dagFromJSON(request.body());
dagSpec.tasks =
expandTaskSet(dagSpec.tasks, executor_, dagSpec.taskConfig.variables);
// Get a run ID
runID = logger_.startDAGRun(dagSpec);
auto dag = buildDAGFromTasks(dagSpec.tasks);
queueDAG_(runID, dag, dagSpec.taskConfig);
} }
catch (std::runtime_error &e) { catch (std::runtime_error &e) {
REQ_RESPONSE(Not_Acceptable, e.what()); REQ_RESPONSE(Not_Acceptable, e.what());
} }
dagSpec.tasks =
expandTaskSet(dagSpec.tasks, executor_, dagSpec.taskConfig.variables);
// Get a run ID
DAGRunID runID = logger_.startDAGRun(dagSpec);
auto dag = buildDAGFromTasks(dagSpec.tasks);
queueDAG_(runID, dag, dagSpec.taskConfig);
response.send(Pistache::Http::Code::Ok, response.send(Pistache::Http::Code::Ok,
R"({"runID": )" + std::to_string(runID) + "}\n"); R"({"runID": )" + std::to_string(runID) + "}\n");
} }
@@ -225,7 +224,7 @@ namespace daggy::daggyd {
std::string error = e.what(); std::string error = e.what();
response.send( response.send(
Pistache::Http::Code::Ok, Pistache::Http::Code::Ok,
std::string{R"({"valid": true, "error": })"} + error + "}\n"); std::string{R"({"valid": false, "error": })"} + error + "}\n");
} }
} }