comparison OrthancServer/main.cpp @ 1872:09a737a6bf36

merge
author Sebastien Jodogne <s.jodogne@gmail.com>
date Mon, 07 Dec 2015 09:48:34 +0100
parents e8146c9c28a4 9af3b492b010
children b1291df2f780
comparison
equal deleted inserted replaced
1871:e8146c9c28a4 1872:09a737a6bf36
833 return false; 833 return false;
834 } 834 }
835 835
836 LOG(WARNING) << "Upgrading the database from schema version " 836 LOG(WARNING) << "Upgrading the database from schema version "
837 << currentVersion << " to " << ORTHANC_DATABASE_VERSION; 837 << currentVersion << " to " << ORTHANC_DATABASE_VERSION;
838 database.Upgrade(ORTHANC_DATABASE_VERSION, storageArea); 838
839 try
840 {
841 database.Upgrade(ORTHANC_DATABASE_VERSION, storageArea);
842 }
843 catch (OrthancException&)
844 {
845 LOG(ERROR) << "Unable to run the automated upgrade, please use the replication instructions: "
846 << "https://orthanc.chu.ulg.ac.be/book/users/replication.html";
847 throw;
848 }
839 849
840 // Sanity check 850 // Sanity check
841 currentVersion = database.GetDatabaseVersion(); 851 currentVersion = database.GetDatabaseVersion();
842 if (ORTHANC_DATABASE_VERSION != currentVersion) 852 if (ORTHANC_DATABASE_VERSION != currentVersion)
843 { 853 {