diff options
| author | Alaa Eddine Elamri <alaeddine.elamri@bareos.com> | 2022-10-28 12:36:32 +0300 |
|---|---|---|
| committer | Andreas Rogge <andreas.rogge@bareos.com> | 2022-11-07 19:16:29 +0300 |
| commit | ed0626520e8db05d5f9845c9e9c97a18429aa395 (patch) | |
| tree | 1803d5157da2020d34bdc482188584531060c692 | |
| parent | f5a02861cae9360971198ecd8510690076a22124 (diff) | |
remove reset jobstatus and replace with forcejobstatus
| -rw-r--r-- | core/src/dird/fd_cmds.cc | 2 | ||||
| -rw-r--r-- | core/src/include/jcr.h | 1 | ||||
| -rw-r--r-- | core/src/lib/jcr.cc | 5 |
3 files changed, 1 insertions, 7 deletions
diff --git a/core/src/dird/fd_cmds.cc b/core/src/dird/fd_cmds.cc index f11ceec3f..38509c8df 100644 --- a/core/src/dird/fd_cmds.cc +++ b/core/src/dird/fd_cmds.cc @@ -294,7 +294,7 @@ bool ConnectToFileDaemon(JobControlRecord* jcr, delete jcr->file_bsock; jcr->file_bsock = nullptr; } - jcr->resetJobStatus(JS_Running); + jcr->forceJobStatus(JS_Running); jcr->impl->connection_handshake_try_ = ClientConnectionHandshakeMode::kCleartextFirst; break; diff --git a/core/src/include/jcr.h b/core/src/include/jcr.h index 8fcf1cf12..f338f88a5 100644 --- a/core/src/include/jcr.h +++ b/core/src/include/jcr.h @@ -133,7 +133,6 @@ class JobControlRecord { const char* get_OperationName(); /**< in lib/jcr.c */ const char* get_ActionName(bool past = false); /**< in lib/jcr.c */ void setJobStatus(int newJobStatus); /**< in lib/jcr.c */ - void resetJobStatus(int newJobStatus); /**< in lib/jcr.c */ bool sendJobStatus(); /**< in lib/jcr.c */ bool sendJobStatus(int newJobStatus); /**< in lib/jcr.c */ bool JobReads(); /**< in lib/jcr.c */ diff --git a/core/src/lib/jcr.cc b/core/src/lib/jcr.cc index 7927ad127..cc1f1e072 100644 --- a/core/src/lib/jcr.cc +++ b/core/src/lib/jcr.cc @@ -756,11 +756,6 @@ void JobControlRecord::setJobStarted() job_started_time = time(nullptr); } -void JobControlRecord::resetJobStatus(int newJobStatus) -{ - JobStatus = newJobStatus; -} - void JobControlRecord::setJobStatus(int newJobStatus) { int priority; |