From cccb2d71885d1211b3eb2fc9531826457846b014 Mon Sep 17 00:00:00 2001 From: Dan Engelbrecht Date: Mon, 22 Jan 2024 13:21:55 +0100 Subject: jobqueue - allow multiple threads to report progress/messages (#635) jobqueue - add AbortReason and properly propagate error when running async command --- src/zenserver/admin/admin.cpp | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src/zenserver/admin/admin.cpp') diff --git a/src/zenserver/admin/admin.cpp b/src/zenserver/admin/admin.cpp index 8b3f5a785..8093a0735 100644 --- a/src/zenserver/admin/admin.cpp +++ b/src/zenserver/admin/admin.cpp @@ -171,6 +171,10 @@ HttpAdminService::HttpAdminService(GcScheduler& Scheduler, } Obj.EndArray(); } + if (!State.AbortReason.empty()) + { + Obj.AddString("AbortReason"sv, State.AbortReason); + } }; auto GetAgeAsSeconds = [](std::chrono::system_clock::time_point Start, std::chrono::system_clock::time_point End) { @@ -210,6 +214,7 @@ HttpAdminService::HttpAdminService(GcScheduler& Scheduler, CbObjectWriter Obj; Obj.AddString("Name"sv, CurrentState->Name); Obj.AddString("Status"sv, "Aborted"sv); + WriteState(Obj, CurrentState->State); Obj.AddFloat("QueueTimeS", GetAgeAsSeconds(CurrentState->CreateTime, CurrentState->StartTime)); Obj.AddFloat("RunTimeS", GetAgeAsSeconds(CurrentState->StartTime, CurrentState->EndTime)); -- cgit v1.2.3