Mercurial > hg > orthanc

changeset 2925:a80ba85d89e6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Orthanc starts even if jobs from a previous execution cannot be unserialized
author Sebastien Jodogne <s.jodogne@gmail.com>
date Fri, 09 Nov 2018 09:46:21 +0100
parents 22524fd06225
children 0bcf46cea4e4
files NEWS OrthancServer/ServerContext.cpp
diffstat 2 files changed, 3 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/NEWS	Fri Nov 09 09:06:46 2018 +0100
+++ b/NEWS	Fri Nov 09 09:46:21 2018 +0100
@@ -30,6 +30,7 @@
 * Fix: Closing DICOM associations after running query/retrieve from REST API
 * Fix: Allow creation of MONOCHROME1 grayscale images in tools/create-dicom
 * Remove invalid characters from badly-encoded UTF-8 strings (impacts PostgreSQL)
+* Orthanc starts even if jobs from a previous execution cannot be unserialized
 
 
 Version 1.4.2 (2018-09-20)
--- a/OrthancServer/ServerContext.cpp	Fri Nov 09 09:06:46 2018 +0100
+++ b/OrthancServer/ServerContext.cpp	Fri Nov 09 09:46:21 2018 +0100
@@ -170,8 +170,7 @@
         }
         catch (OrthancException& e)
         {
-          LOG(ERROR) << "Cannot unserialize the jobs engine: " << e.What();
-          throw;
+          LOG(WARNING) << "Cannot unserialize the jobs engine, starting anyway: " << e.What();
         }
       }
       else
@@ -181,11 +180,9 @@
     }
     else
     {
-      LOG(WARNING) << "Not reloading the jobs from the last execution of Orthanc";
+      LOG(INFO) << "Not reloading the jobs from the last execution of Orthanc";
     }
 
-    //jobsEngine_.GetRegistry().SetMaxCompleted   // TODO
-
     jobsEngine_.GetRegistry().SetObserver(*this);
     jobsEngine_.Start();
     isJobsEngineUnserialized_ = true;