use new builds api for oplogs (#464)

- Improvement: Refactored jupiter oplog export code to reuse builds jupiter wrapper classes
- Improvement: If `zen builds`, `zen oplog-import` or `zen oplog-import` command fails due to a http error, the return code for the program will be set to the error/status code

2 files changed, 32 insertions, 1 deletions

diff --git a/src/zencore/include/zencore/jobqueue.h b/src/zencore/include/zencore/jobqueue.h
index d5ec6255a..470ed3fc6 100644
--- a/src/zencore/include/zencore/jobqueue.h
+++ b/src/zencore/include/zencore/jobqueue.h
@@ -28,6 +28,16 @@ public:
 	virtual void ReportProgress(std::string_view CurrentOp, std::string_view Details, ptrdiff_t TotalCount, ptrdiff_t RemainingCount) = 0;
 };
 
+class JobError : public std::runtime_error
+{
+public:
+	using _Mybase = runtime_error;
+
+	JobError(const std::string& Message, int ReturnCode) : _Mybase(Message), m_ReturnCode(ReturnCode) {}
+
+	const int m_ReturnCode = 0;
+};
+
 class JobQueue
 {
 public:
@@ -73,6 +83,7 @@ public:
 		std::chrono::system_clock::time_point StartTime;
 		std::chrono::system_clock::time_point EndTime;
 		int									  WorkerThreadId;
+		int									  ReturnCode;
 	};
 
 	// Will only respond once when status is Complete or Aborted
diff --git a/src/zencore/jobqueue.cpp b/src/zencore/jobqueue.cpp
index b97484458..5d727b69c 100644
--- a/src/zencore/jobqueue.cpp
+++ b/src/zencore/jobqueue.cpp
@@ -50,6 +50,7 @@ public:
 		JobClock::Tick	 StartTick;
 		JobClock::Tick	 EndTick;
 		int				 WorkerThreadId;
+		int				 ReturnCode;
 
 		virtual bool IsCancelled() const override { return CancelFlag.load(); }
 		virtual void ReportMessage(std::string_view Message) override { Queue->ReportMessage(Id, Message); }
@@ -101,6 +102,7 @@ public:
 		NewJob->StartTick	   = JobClock::Never();
 		NewJob->EndTick		   = JobClock::Never();
 		NewJob->WorkerThreadId = 0;
+		NewJob->ReturnCode	   = -1;
 
 		ZEN_DEBUG("Scheduling background job {}:'{}'", NewJob->Id.Id, NewJob->Name);
 		QueueLock.WithExclusiveLock([&]() { QueuedJobs.emplace_back(std::move(NewJob)); });
@@ -274,7 +276,8 @@ public:
 				.CreateTime		= JobClock::TimePointFromTick(Job.CreateTick),
 				.StartTime		= JobClock::TimePointFromTick(Job.StartTick),
 				.EndTime		= JobClock::TimePointFromTick(Job.EndTick),
-				.WorkerThreadId = Job.WorkerThreadId};
+				.WorkerThreadId = Job.WorkerThreadId,
+				.ReturnCode		= Job.ReturnCode};
 		};
 
 		std::optional<JobDetails> Result;
@@ -365,6 +368,7 @@ public:
 			ZEN_DEBUG("Executing background job {}:'{}'", CurrentJob->Id.Id, CurrentJob->Name);
 			CurrentJob->Callback(*CurrentJob);
 			ZEN_DEBUG("Completed background job {}:'{}'", CurrentJob->Id.Id, CurrentJob->Name);
+			CurrentJob->ReturnCode = 0;
 			QueueLock.WithExclusiveLock([&]() {
 				CurrentJob->EndTick		   = JobClock::Now();
 				CurrentJob->WorkerThreadId = 0;
@@ -383,6 +387,22 @@ public:
 				AbortedJobs.insert_or_assign(CurrentJob->Id.Id, std::move(CurrentJob));
 			});
 		}
+		catch (const JobError& Ex)
+		{
+			ZEN_DEBUG("Background job {}:'{}' failed. Reason: '{}'. Return code {}",
+					  CurrentJob->Id.Id,
+					  CurrentJob->Name,
+					  Ex.what(),
+					  Ex.m_ReturnCode);
+			QueueLock.WithExclusiveLock([&]() {
+				CurrentJob->State.AbortReason = Ex.what();
+				CurrentJob->EndTick			  = JobClock::Now();
+				CurrentJob->WorkerThreadId	  = 0;
+				CurrentJob->ReturnCode		  = Ex.m_ReturnCode;
+				RunningJobs.erase(CurrentJob->Id.Id);
+				AbortedJobs.insert_or_assign(CurrentJob->Id.Id, std::move(CurrentJob));
+			});
+		}
 		catch (const std::exception& Ex)
 		{
 			ZEN_DEBUG("Background job {}:'{}' aborted. Reason: '{}'", CurrentJob->Id.Id, CurrentJob->Name, Ex.what());