remove reset jobstatus and replace with forcejobstatus

bareos · Nov 7, 2022 · ed06265 · ed06265
1 parent f5a0286
commit ed06265
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 7 deletions.
diff --git 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
@@ -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
@@ -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;