changeset 40:5600949bfb12

preparing for release
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 17 Jul 2018 08:28:02 +0200
parents a9b8375099f6
children f729a4b6f37a 3897ec1cf657
files MySQL/Plugins/IndexPlugin.cpp MySQL/Plugins/StoragePlugin.cpp MySQL/UnitTests/UnitTestsMain.cpp
diffstat 3 files changed, 11 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/MySQL/Plugins/IndexPlugin.cpp	Mon Jul 16 21:33:16 2018 +0200
+++ b/MySQL/Plugins/IndexPlugin.cpp	Tue Jul 17 08:28:02 2018 +0200
@@ -23,6 +23,7 @@
 #include "../../Framework/MySQL/MySQLDatabase.h"
 #include "../../Framework/Plugins/PluginInitialization.h"
 
+#include <Core/HttpClient.h>
 #include <Core/Logging.h>
 
 static std::auto_ptr<OrthancDatabases::MySQLIndex> backend_;
@@ -37,6 +38,8 @@
       return -1;
     }
 
+    Orthanc::HttpClient::GlobalInitialize();
+
     OrthancPlugins::OrthancConfiguration configuration(context);
 
     if (!configuration.IsSection("MySQL"))
@@ -88,6 +91,7 @@
 
     backend_.reset(NULL);
     OrthancDatabases::MySQLDatabase::GlobalFinalization();
+    Orthanc::HttpClient::GlobalFinalize();
   }
 
 
--- a/MySQL/Plugins/StoragePlugin.cpp	Mon Jul 16 21:33:16 2018 +0200
+++ b/MySQL/Plugins/StoragePlugin.cpp	Tue Jul 17 08:28:02 2018 +0200
@@ -23,6 +23,7 @@
 #include "../../Framework/MySQL/MySQLDatabase.h"
 #include "../../Framework/Plugins/PluginInitialization.h"
 
+#include <Core/HttpClient.h>
 #include <Core/Logging.h>
 
 
@@ -35,6 +36,8 @@
       return -1;
     }
 
+    Orthanc::HttpClient::GlobalInitialize();
+
     OrthancPlugins::OrthancConfiguration configuration(context);
 
     if (!configuration.IsSection("MySQL"))
@@ -82,6 +85,7 @@
 
     OrthancDatabases::StorageBackend::Finalize();
     OrthancDatabases::MySQLDatabase::GlobalFinalization();
+    Orthanc::HttpClient::GlobalFinalize();
   }
 
 
--- a/MySQL/UnitTests/UnitTestsMain.cpp	Mon Jul 16 21:33:16 2018 +0200
+++ b/MySQL/UnitTests/UnitTestsMain.cpp	Tue Jul 17 08:28:02 2018 +0200
@@ -31,6 +31,7 @@
 #include "../../Framework/MySQL/MySQLTransaction.h"
 #include "../../Framework/Plugins/IndexUnitTests.h"
 
+#include <Core/HttpClient.h>
 #include <Core/Logging.h>
 
 #include <gtest/gtest.h>
@@ -215,6 +216,7 @@
   Orthanc::Logging::Initialize();
   Orthanc::Logging::EnableInfoLevel(true);
   Orthanc::Logging::EnableTraceLevel(true);
+  Orthanc::HttpClient::GlobalInitialize();
   
   if (args.size() == 4)
   {
@@ -246,6 +248,7 @@
 
   int result = RUN_ALL_TESTS();
 
+  Orthanc::HttpClient::GlobalFinalize();
   Orthanc::Logging::Finalize();
 
   OrthancDatabases::MySQLDatabase::GlobalFinalization();