Mercurial > hg > orthanc

changeset 1486:f967bdf8534e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
refactoring to Logging.h
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 04 Aug 2015 10:01:31 +0200
parents 27661b33f624
children 23083810d543
files Core/Cache/MemoryCache.cpp Core/FileStorage/CompressedFileStorageAccessor.cpp Core/FileStorage/FilesystemStorage.cpp Core/HttpServer/EmbeddedResourceHttpHandler.cpp Core/HttpServer/HttpOutput.cpp Core/HttpServer/MongooseServer.cpp Core/ImageFormats/ImageAccessor.cpp Core/Logging.h Core/Lua/LuaContext.cpp Core/Lua/LuaFunctionCall.cpp Core/MultiThreading/BagOfRunnablesBySteps.cpp Core/PrecompiledHeaders.h Core/RestApi/RestApi.cpp Core/RestApi/RestApiOutput.cpp Core/SQLite/Connection.cpp Core/SQLite/Statement.cpp Core/SQLite/StatementReference.cpp Core/Toolbox.cpp OrthancServer/DatabaseWrapper.cpp OrthancServer/DicomDirWriter.cpp OrthancServer/DicomInstanceToStore.cpp OrthancServer/DicomModification.cpp OrthancServer/DicomProtocol/DicomServer.cpp OrthancServer/DicomProtocol/DicomUserConnection.cpp OrthancServer/DicomProtocol/ReusableDicomUserConnection.cpp OrthancServer/FromDcmtkBridge.cpp OrthancServer/Internals/CommandDispatcher.cpp OrthancServer/Internals/DicomImageDecoder.cpp OrthancServer/Internals/FindScp.cpp OrthancServer/Internals/MoveScp.cpp OrthancServer/Internals/StoreScp.cpp OrthancServer/LuaScripting.cpp OrthancServer/OrthancFindRequestHandler.cpp OrthancServer/OrthancMoveRequestHandler.cpp OrthancServer/OrthancRestApi/OrthancRestAnonymizeModify.cpp OrthancServer/OrthancRestApi/OrthancRestApi.cpp OrthancServer/OrthancRestApi/OrthancRestArchive.cpp OrthancServer/OrthancRestApi/OrthancRestChanges.cpp OrthancServer/OrthancRestApi/OrthancRestModalities.cpp OrthancServer/OrthancRestApi/OrthancRestResources.cpp OrthancServer/OrthancRestApi/OrthancRestSystem.cpp OrthancServer/ParsedDicomFile.cpp OrthancServer/ResourceFinder.cpp OrthancServer/Scheduler/CallSystemCommand.cpp OrthancServer/Scheduler/DeleteInstanceCommand.cpp OrthancServer/Scheduler/ModifyInstanceCommand.cpp OrthancServer/Scheduler/ServerScheduler.cpp OrthancServer/Scheduler/StorePeerCommand.cpp OrthancServer/Scheduler/StoreScuCommand.cpp OrthancServer/ServerContext.cpp OrthancServer/ServerIndex.cpp OrthancServer/ServerToolbox.cpp OrthancServer/main.cpp Plugins/Engine/OrthancPluginDatabase.cpp Plugins/Engine/OrthancPlugins.cpp Plugins/Engine/PluginsManager.cpp Plugins/Engine/SharedLibrary.cpp UnitTestsSources/FileStorageTests.cpp UnitTestsSources/MemoryCacheTests.cpp UnitTestsSources/MultiThreadingTests.cpp UnitTestsSources/PluginsTests.cpp UnitTestsSources/RestApiTests.cpp UnitTestsSources/ServerIndexTests.cpp
diffstat 63 files changed, 86 insertions(+), 118 deletions(-) [+]
line wrap: on
line diff
--- a/Core/Cache/MemoryCache.cpp	Tue Aug 04 09:35:09 2015 +0200
+++ b/Core/Cache/MemoryCache.cpp	Tue Aug 04 10:01:31 2015 +0200
@@ -33,9 +33,7 @@
 #include "../PrecompiledHeaders.h"
 #include "MemoryCache.h"
 
-#include <stdlib.h>  // This fixes a problem in glog for recent
-                     // releases of MinGW
-#include <glog/logging.h>
+#include "../Logging.h"
 
 namespace Orthanc
 {
--- a/Core/FileStorage/CompressedFileStorageAccessor.cpp	Tue Aug 04 09:35:09 2015 +0200
+++ b/Core/FileStorage/CompressedFileStorageAccessor.cpp	Tue Aug 04 10:01:31 2015 +0200
@@ -33,13 +33,13 @@
 #include "../PrecompiledHeaders.h"
 #include "CompressedFileStorageAccessor.h"
 
+#include "../HttpServer/BufferHttpSender.h"
+#include "../Logging.h"
 #include "../OrthancException.h"
+#include "../Uuid.h"
 #include "FileStorageAccessor.h"
-#include "../HttpServer/BufferHttpSender.h"
-#include "../Uuid.h"
 
 #include <memory>
-#include <glog/logging.h>
 
 namespace Orthanc
 {
--- a/Core/FileStorage/FilesystemStorage.cpp	Tue Aug 04 09:35:09 2015 +0200
+++ b/Core/FileStorage/FilesystemStorage.cpp	Tue Aug 04 10:01:31 2015 +0200
@@ -36,15 +36,13 @@
 // http://stackoverflow.com/questions/1576272/storing-large-number-of-files-in-file-system
 // http://stackoverflow.com/questions/446358/storing-a-large-number-of-images
 
+#include "../Logging.h"
 #include "../OrthancException.h"
 #include "../Toolbox.h"
 #include "../Uuid.h"
 
 #include <boost/filesystem/fstream.hpp>
 
-#if HAVE_GOOGLE_LOG == 1
-#include <glog/logging.h>
-#endif
 
 static std::string ToString(const boost::filesystem::path& p)
 {
--- a/Core/HttpServer/EmbeddedResourceHttpHandler.cpp	Tue Aug 04 09:35:09 2015 +0200
+++ b/Core/HttpServer/EmbeddedResourceHttpHandler.cpp	Tue Aug 04 10:01:31 2015 +0200
@@ -33,11 +33,11 @@
 #include "../PrecompiledHeaders.h"
 #include "EmbeddedResourceHttpHandler.h"
 
+#include "../Logging.h"
 #include "../OrthancException.h"
 #include "HttpOutput.h"
 
 #include <stdio.h>
-#include <glog/logging.h>
 
 
 namespace Orthanc
--- a/Core/HttpServer/HttpOutput.cpp	Tue Aug 04 09:35:09 2015 +0200
+++ b/Core/HttpServer/HttpOutput.cpp	Tue Aug 04 10:01:31 2015 +0200
@@ -33,13 +33,15 @@
 #include "../PrecompiledHeaders.h"
 #include "HttpOutput.h"
 
+#include "../Logging.h"
+#include "../OrthancException.h"
+#include "../Toolbox.h"
+
 #include <iostream>
 #include <vector>
 #include <stdio.h>
-#include <glog/logging.h>
 #include <boost/lexical_cast.hpp>
-#include "../OrthancException.h"
-#include "../Toolbox.h"
+
 
 namespace Orthanc
 {
--- a/Core/HttpServer/MongooseServer.cpp	Tue Aug 04 09:35:09 2015 +0200
+++ b/Core/HttpServer/MongooseServer.cpp	Tue Aug 04 10:01:31 2015 +0200
@@ -35,6 +35,12 @@
 #include "../PrecompiledHeaders.h"
 #include "MongooseServer.h"
 
+#include "../Logging.h"
+#include "../OrthancException.h"
+#include "../ChunkedBuffer.h"
+#include "HttpToolbox.h"
+#include "mongoose.h"
+
 #include <algorithm>
 #include <string.h>
 #include <boost/lexical_cast.hpp>
@@ -43,12 +49,6 @@
 #include <string.h>
 #include <stdio.h>
 #include <boost/thread.hpp>
-#include <glog/logging.h>
-
-#include "../OrthancException.h"
-#include "../ChunkedBuffer.h"
-#include "HttpToolbox.h"
-#include "mongoose.h"
 
 #if ORTHANC_SSL_ENABLED == 1
 #include <openssl/opensslv.h>
--- a/Core/ImageFormats/ImageAccessor.cpp	Tue Aug 04 09:35:09 2015 +0200
+++ b/Core/ImageFormats/ImageAccessor.cpp	Tue Aug 04 10:01:31 2015 +0200
@@ -33,6 +33,7 @@
 #include "../PrecompiledHeaders.h"
 #include "ImageAccessor.h"
 
+#include "../Logging.h"
 #include "../OrthancException.h"
 #include "../ChunkedBuffer.h"
 
@@ -40,9 +41,6 @@
 #include <cassert>
 #include <boost/lexical_cast.hpp>
 
-#if HAVE_GOOGLE_LOG == 1
-#include <glog/logging.h>
-#endif
 
 
 namespace Orthanc
@@ -108,10 +106,7 @@
   {
     if (readOnly_)
     {
-#if HAVE_GOOGLE_LOG == 1
       LOG(ERROR) << "Trying to write on a read-only image";
-#endif
-
       throw OrthancException(ErrorCode_ReadOnly);
     }
 
@@ -136,10 +131,7 @@
   {
     if (readOnly_)
     {
-#if HAVE_GOOGLE_LOG == 1
       LOG(ERROR) << "Trying to write on a read-only image";
-#endif
-
       throw OrthancException(ErrorCode_ReadOnly);
     }
 
--- a/Core/Logging.h	Tue Aug 04 09:35:09 2015 +0200
+++ b/Core/Logging.h	Tue Aug 04 10:01:31 2015 +0200
@@ -32,7 +32,10 @@
 
 #pragma once
 
+#if HAVE_GOOGLE_LOG == 1
+#include <stdlib.h>  // This fixes a problem in glog for recent releases of MinGW
 #include <glog/logging.h>
+#endif
 
 namespace Orthanc
 {
--- a/Core/Lua/LuaContext.cpp	Tue Aug 04 09:35:09 2015 +0200
+++ b/Core/Lua/LuaContext.cpp	Tue Aug 04 10:01:31 2015 +0200
@@ -33,8 +33,9 @@
 #include "../PrecompiledHeaders.h"
 #include "LuaContext.h"
 
+#include "../Logging.h"
+
 #include <set>
-#include <glog/logging.h>
 #include <cassert>
 #include <boost/lexical_cast.hpp>
 
--- a/Core/Lua/LuaFunctionCall.cpp	Tue Aug 04 09:35:09 2015 +0200
+++ b/Core/Lua/LuaFunctionCall.cpp	Tue Aug 04 10:01:31 2015 +0200
@@ -36,7 +36,6 @@
 #include <cassert>
 #include <stdio.h>
 #include <boost/lexical_cast.hpp>
-#include <glog/logging.h>
 
 namespace Orthanc
 {
--- a/Core/MultiThreading/BagOfRunnablesBySteps.cpp	Tue Aug 04 09:35:09 2015 +0200
+++ b/Core/MultiThreading/BagOfRunnablesBySteps.cpp	Tue Aug 04 10:01:31 2015 +0200
@@ -33,9 +33,10 @@
 #include "../PrecompiledHeaders.h"
 #include "BagOfRunnablesBySteps.h"
 
+#include "../Logging.h"
+
 #include <stack>
 #include <boost/thread.hpp>
-#include <glog/logging.h>
 
 namespace Orthanc
 {
--- a/Core/PrecompiledHeaders.h	Tue Aug 04 09:35:09 2015 +0200
+++ b/Core/PrecompiledHeaders.h	Tue Aug 04 10:01:31 2015 +0200
@@ -46,7 +46,6 @@
 #include <boost/thread.hpp>
 #include <boost/thread/shared_mutex.hpp>
 
-#include <glog/logging.h>
 #include <json/value.h>
 
 #if ORTHANC_PUGIXML_ENABLED == 1
@@ -54,6 +53,7 @@
 #endif
 
 #include "Enumerations.h"
+#include "Logging.h"
 #include "OrthancException.h"
 #include "Toolbox.h"
 #include "Uuid.h"
--- a/Core/RestApi/RestApi.cpp	Tue Aug 04 09:35:09 2015 +0200
+++ b/Core/RestApi/RestApi.cpp	Tue Aug 04 10:01:31 2015 +0200
@@ -33,9 +33,9 @@
 #include "../PrecompiledHeaders.h"
 #include "RestApi.h"
 
+#include "../Logging.h"
+
 #include <stdlib.h>   // To define "_exit()" under Windows
-#include <glog/logging.h>
-
 #include <stdio.h>
 
 namespace Orthanc
--- a/Core/RestApi/RestApiOutput.cpp	Tue Aug 04 09:35:09 2015 +0200
+++ b/Core/RestApi/RestApiOutput.cpp	Tue Aug 04 10:01:31 2015 +0200
@@ -33,10 +33,11 @@
 #include "../PrecompiledHeaders.h"
 #include "RestApiOutput.h"
 
+#include "../Logging.h"
+#include "../OrthancException.h"
+
 #include <boost/lexical_cast.hpp>
-#include <glog/logging.h>
 
-#include "../OrthancException.h"
 
 namespace Orthanc
 {
--- a/Core/SQLite/Connection.cpp	Tue Aug 04 09:35:09 2015 +0200
+++ b/Core/SQLite/Connection.cpp	Tue Aug 04 10:01:31 2015 +0200
@@ -47,7 +47,7 @@
 #include <string.h>
 
 #if ORTHANC_SQLITE_STANDALONE != 1
-#include <glog/logging.h>
+#include "../Logging.h"
 #endif
 
 #include "sqlite3.h"
--- a/Core/SQLite/Statement.cpp	Tue Aug 04 09:35:09 2015 +0200
+++ b/Core/SQLite/Statement.cpp	Tue Aug 04 10:01:31 2015 +0200
@@ -47,7 +47,7 @@
 #include <algorithm>
 
 #if ORTHANC_SQLITE_STANDALONE != 1
-#include <glog/logging.h>
+#include "../Logging.h"
 #endif
 
 #include "sqlite3.h"
--- a/Core/SQLite/StatementReference.cpp	Tue Aug 04 09:35:09 2015 +0200
+++ b/Core/SQLite/StatementReference.cpp	Tue Aug 04 10:01:31 2015 +0200
@@ -43,7 +43,7 @@
 #include "OrthancSQLiteException.h"
 
 #if ORTHANC_SQLITE_STANDALONE != 1
-#include <glog/logging.h>
+#include "../Logging.h"
 #endif
 
 #include <string>
--- a/Core/Toolbox.cpp	Tue Aug 04 09:35:09 2015 +0200
+++ b/Core/Toolbox.cpp	Tue Aug 04 10:01:31 2015 +0200
@@ -34,6 +34,7 @@
 #include "Toolbox.h"
 
 #include "OrthancException.h"
+#include "Logging.h"
 
 #include <string>
 #include <stdint.h>
@@ -53,10 +54,6 @@
 #include <boost/regex.hpp> 
 #endif
 
-#if HAVE_GOOGLE_LOG == 1
-#include <glog/logging.h>
-#endif
-
 #if defined(_WIN32)
 #include <windows.h>
 #include <process.h>   // For "_spawnvp()"
@@ -1135,10 +1132,7 @@
     if (pid == -1)
     {
       // Error in fork()
-#if HAVE_GOOGLE_LOG == 1
       LOG(ERROR) << "Cannot fork a child process";
-#endif
-
       throw OrthancException(ErrorCode_SystemCommand);
     }
     else if (pid == 0)
@@ -1158,10 +1152,7 @@
 
     if (status != 0)
     {
-#if HAVE_GOOGLE_LOG == 1
       LOG(ERROR) << "System command failed with status code " << status;
-#endif
-
       throw OrthancException(ErrorCode_SystemCommand);
     }
   }
--- a/OrthancServer/DatabaseWrapper.cpp	Tue Aug 04 09:35:09 2015 +0200
+++ b/OrthancServer/DatabaseWrapper.cpp	Tue Aug 04 10:01:31 2015 +0200
@@ -34,10 +34,10 @@
 #include "DatabaseWrapper.h"
 
 #include "../Core/DicomFormat/DicomArray.h"
+#include "../Core/Logging.h"
 #include "../Core/Uuid.h"
 #include "EmbeddedResources.h"
 
-#include <glog/logging.h>
 #include <stdio.h>
 #include <boost/lexical_cast.hpp>
 
--- a/OrthancServer/DicomDirWriter.cpp	Tue Aug 04 09:35:09 2015 +0200
+++ b/OrthancServer/DicomDirWriter.cpp	Tue Aug 04 10:01:31 2015 +0200
@@ -103,6 +103,7 @@
 #include "FromDcmtkBridge.h"
 #include "ToDcmtkBridge.h"
 
+#include "../Core/Logging.h"
 #include "../Core/OrthancException.h"
 #include "../Core/Uuid.h"
 
@@ -118,7 +119,6 @@
 #include "dcmtk/dcmdata/dcvrtm.h"     /* for class DcmTime */
 
 #include <memory>
-#include <glog/logging.h>
 
 namespace Orthanc
 {
--- a/OrthancServer/DicomInstanceToStore.cpp	Tue Aug 04 09:35:09 2015 +0200
+++ b/OrthancServer/DicomInstanceToStore.cpp	Tue Aug 04 10:01:31 2015 +0200
@@ -33,9 +33,9 @@
 #include "DicomInstanceToStore.h"
 
 #include "FromDcmtkBridge.h"
+#include "../Core/Logging.h"
 
 #include <dcmtk/dcmdata/dcfilefo.h>
-#include <glog/logging.h>
 
 
 namespace Orthanc
--- a/OrthancServer/DicomModification.cpp	Tue Aug 04 09:35:09 2015 +0200
+++ b/OrthancServer/DicomModification.cpp	Tue Aug 04 10:01:31 2015 +0200
@@ -33,11 +33,11 @@
 #include "PrecompiledHeadersServer.h"
 #include "DicomModification.h"
 
+#include "../Core/Logging.h"
 #include "../Core/OrthancException.h"
 #include "FromDcmtkBridge.h"
 
 #include <memory>   // For std::auto_ptr
-#include <glog/logging.h>
 
 
 static const std::string ORTHANC_DEIDENTIFICATION_METHOD = "Orthanc " ORTHANC_VERSION " - PS 3.15-2008 Table E.1-1";
--- a/OrthancServer/DicomProtocol/DicomServer.cpp	Tue Aug 04 09:35:09 2015 +0200
+++ b/OrthancServer/DicomProtocol/DicomServer.cpp	Tue Aug 04 10:01:31 2015 +0200
@@ -33,6 +33,7 @@
 #include "../PrecompiledHeadersServer.h"
 #include "DicomServer.h"
 
+#include "../../Core/Logging.h"
 #include "../../Core/OrthancException.h"
 #include "../../Core/Toolbox.h"
 #include "../../Core/Uuid.h"
@@ -43,7 +44,6 @@
 #include <boost/thread.hpp>
 #include <boost/filesystem.hpp>
 #include <dcmtk/dcmdata/dcdict.h>
-#include <glog/logging.h>
 
 #if defined(__linux)
 #include <cstdlib>
--- a/OrthancServer/DicomProtocol/DicomUserConnection.cpp	Tue Aug 04 09:35:09 2015 +0200
+++ b/OrthancServer/DicomProtocol/DicomUserConnection.cpp	Tue Aug 04 10:01:31 2015 +0200
@@ -81,10 +81,11 @@
 #include "../PrecompiledHeadersServer.h"
 #include "DicomUserConnection.h"
 
+#include "../../Core/DicomFormat/DicomArray.h"
+#include "../../Core/Logging.h"
 #include "../../Core/OrthancException.h"
+#include "../FromDcmtkBridge.h"
 #include "../ToDcmtkBridge.h"
-#include "../FromDcmtkBridge.h"
-#include "../../Core/DicomFormat/DicomArray.h"
 
 #include <dcmtk/dcmdata/dcistrmb.h>
 #include <dcmtk/dcmdata/dcistrmf.h>
@@ -93,8 +94,6 @@
 #include <dcmtk/dcmnet/diutil.h>
 
 #include <set>
-#include <glog/logging.h>
-
 
 
 #ifdef _WIN32
--- a/OrthancServer/DicomProtocol/ReusableDicomUserConnection.cpp	Tue Aug 04 09:35:09 2015 +0200
+++ b/OrthancServer/DicomProtocol/ReusableDicomUserConnection.cpp	Tue Aug 04 10:01:31 2015 +0200
@@ -33,10 +33,9 @@
 #include "../PrecompiledHeadersServer.h"
 #include "ReusableDicomUserConnection.h"
 
+#include "../../Core/Logging.h"
 #include "../../Core/OrthancException.h"
 
-#include <glog/logging.h>
-
 namespace Orthanc
 {
   static boost::posix_time::ptime Now()
--- a/OrthancServer/FromDcmtkBridge.cpp	Tue Aug 04 09:35:09 2015 +0200
+++ b/OrthancServer/FromDcmtkBridge.cpp	Tue Aug 04 10:01:31 2015 +0200
@@ -42,6 +42,7 @@
 #include "FromDcmtkBridge.h"
 #include "ToDcmtkBridge.h"
 #include "OrthancInitialization.h"
+#include "../Core/Logging.h"
 #include "../Core/Toolbox.h"
 #include "../Core/OrthancException.h"
 #include "../Core/ImageFormats/PngWriter.h"
@@ -92,7 +93,6 @@
 
 
 #include <boost/math/special_functions/round.hpp>
-#include <glog/logging.h>
 #include <dcmtk/dcmdata/dcostrmb.h>
 
 
--- a/OrthancServer/Internals/CommandDispatcher.cpp	Tue Aug 04 09:35:09 2015 +0200
+++ b/OrthancServer/Internals/CommandDispatcher.cpp	Tue Aug 04 10:01:31 2015 +0200
@@ -86,10 +86,10 @@
 #include "StoreScp.h"
 #include "MoveScp.h"
 #include "../../Core/Toolbox.h"
+#include "../../Core/Logging.h"
 
 #include <dcmtk/dcmnet/dcasccfg.h>      /* for class DcmAssociationConfiguration */
 #include <boost/lexical_cast.hpp>
-#include <glog/logging.h>
 
 #define ORTHANC_PROMISCUOUS 1
 
--- a/OrthancServer/Internals/DicomImageDecoder.cpp	Tue Aug 04 09:35:09 2015 +0200
+++ b/OrthancServer/Internals/DicomImageDecoder.cpp	Tue Aug 04 10:01:31 2015 +0200
@@ -80,6 +80,7 @@
 #include "../PrecompiledHeadersServer.h"
 #include "DicomImageDecoder.h"
 
+#include "../../Core/Logging.h"
 #include "../../Core/OrthancException.h"
 #include "../../Core/ImageFormats/ImageProcessing.h"
 #include "../../Core/ImageFormats/PngWriter.h"  // TODO REMOVE THIS
@@ -87,8 +88,6 @@
 #include "../ToDcmtkBridge.h"
 #include "../FromDcmtkBridge.h"
 
-#include <glog/logging.h>
-
 #include <boost/lexical_cast.hpp>
 
 #if ORTHANC_JPEG_LOSSLESS_ENABLED == 1
--- a/OrthancServer/Internals/FindScp.cpp	Tue Aug 04 09:35:09 2015 +0200
+++ b/OrthancServer/Internals/FindScp.cpp	Tue Aug 04 10:01:31 2015 +0200
@@ -84,9 +84,9 @@
 
 #include "../FromDcmtkBridge.h"
 #include "../ToDcmtkBridge.h"
+#include "../../Core/Logging.h"
 #include "../../Core/OrthancException.h"
 
-#include <glog/logging.h>
 
 
 namespace Orthanc
--- a/OrthancServer/Internals/MoveScp.cpp	Tue Aug 04 09:35:09 2015 +0200
+++ b/OrthancServer/Internals/MoveScp.cpp	Tue Aug 04 10:01:31 2015 +0200
@@ -86,10 +86,9 @@
 
 #include "../FromDcmtkBridge.h"
 #include "../ToDcmtkBridge.h"
+#include "../../Core/Logging.h"
 #include "../../Core/OrthancException.h"
 
-#include <glog/logging.h>
-
 
 namespace Orthanc
 {
--- a/OrthancServer/Internals/StoreScp.cpp	Tue Aug 04 09:35:09 2015 +0200
+++ b/OrthancServer/Internals/StoreScp.cpp	Tue Aug 04 10:01:31 2015 +0200
@@ -86,13 +86,13 @@
 #include "../ServerToolbox.h"
 #include "../ToDcmtkBridge.h"
 #include "../../Core/OrthancException.h"
+#include "../../Core/Logging.h"
 
 #include <dcmtk/dcmdata/dcfilefo.h>
 #include <dcmtk/dcmdata/dcmetinf.h>
 #include <dcmtk/dcmdata/dcostrmb.h>
 #include <dcmtk/dcmdata/dcdeftag.h>
 #include <dcmtk/dcmnet/diutil.h>
-#include <glog/logging.h>
 
 
 namespace Orthanc
--- a/OrthancServer/LuaScripting.cpp	Tue Aug 04 09:35:09 2015 +0200
+++ b/OrthancServer/LuaScripting.cpp	Tue Aug 04 10:01:31 2015 +0200
@@ -37,6 +37,7 @@
 #include "OrthancInitialization.h"
 #include "../Core/Lua/LuaFunctionCall.h"
 #include "../Core/HttpServer/StringHttpOutput.h"
+#include "../Core/Logging.h"
 
 #include "Scheduler/DeleteInstanceCommand.h"
 #include "Scheduler/StoreScuCommand.h"
@@ -45,7 +46,6 @@
 #include "Scheduler/CallSystemCommand.h"
 #include "OrthancRestApi/OrthancRestApi.h"
 
-#include <glog/logging.h>
 #include <EmbeddedResources.h>
 
 
--- a/OrthancServer/OrthancFindRequestHandler.cpp	Tue Aug 04 09:35:09 2015 +0200
+++ b/OrthancServer/OrthancFindRequestHandler.cpp	Tue Aug 04 10:01:31 2015 +0200
@@ -33,9 +33,7 @@
 #include "PrecompiledHeadersServer.h"
 #include "OrthancFindRequestHandler.h"
 
-#include <glog/logging.h>
-#include <boost/regex.hpp> 
-
+#include "../Core/Logging.h"
 #include "../Core/DicomFormat/DicomArray.h"
 #include "ServerToolbox.h"
 #include "OrthancInitialization.h"
@@ -44,6 +42,8 @@
 #include "ResourceFinder.h"
 #include "DicomFindQuery.h"
 
+#include <boost/regex.hpp> 
+
 
 namespace Orthanc
 {
--- a/OrthancServer/OrthancMoveRequestHandler.cpp	Tue Aug 04 09:35:09 2015 +0200
+++ b/OrthancServer/OrthancMoveRequestHandler.cpp	Tue Aug 04 10:01:31 2015 +0200
@@ -33,11 +33,10 @@
 #include "PrecompiledHeadersServer.h"
 #include "OrthancMoveRequestHandler.h"
 
-#include <glog/logging.h>
-
 #include "OrthancInitialization.h"
 #include "FromDcmtkBridge.h"
 #include "../Core/DicomFormat/DicomArray.h"
+#include "../Core/Logging.h"
 
 namespace Orthanc
 {
--- a/OrthancServer/OrthancRestApi/OrthancRestAnonymizeModify.cpp	Tue Aug 04 09:35:09 2015 +0200
+++ b/OrthancServer/OrthancRestApi/OrthancRestAnonymizeModify.cpp	Tue Aug 04 10:01:31 2015 +0200
@@ -33,12 +33,11 @@
 #include "../PrecompiledHeadersServer.h"
 #include "OrthancRestApi.h"
 
+#include "../../Core/Logging.h"
+#include "../../Core/Uuid.h"
 #include "../FromDcmtkBridge.h"
-#include "../../Core/Uuid.h"
 #include "../ServerContext.h"
 
-#include <glog/logging.h>
-
 namespace Orthanc
 {
   // Modification of DICOM instances ------------------------------------------
--- a/OrthancServer/OrthancRestApi/OrthancRestApi.cpp	Tue Aug 04 09:35:09 2015 +0200
+++ b/OrthancServer/OrthancRestApi/OrthancRestApi.cpp	Tue Aug 04 10:01:31 2015 +0200
@@ -33,11 +33,10 @@
 #include "../PrecompiledHeadersServer.h"
 #include "OrthancRestApi.h"
 
+#include "../../Core/Logging.h"
 #include "../DicomModification.h"
 #include "../ServerContext.h"
 
-#include <glog/logging.h>
-
 namespace Orthanc
 {
   void OrthancRestApi::AnswerStoredInstance(RestApiPostCall& call,
--- a/OrthancServer/OrthancRestApi/OrthancRestArchive.cpp	Tue Aug 04 09:35:09 2015 +0200
+++ b/OrthancServer/OrthancRestApi/OrthancRestArchive.cpp	Tue Aug 04 10:01:31 2015 +0200
@@ -36,10 +36,10 @@
 #include "../DicomDirWriter.h"
 #include "../../Core/Compression/HierarchicalZipWriter.h"
 #include "../../Core/HttpServer/FilesystemHttpSender.h"
+#include "../../Core/Logging.h"
 #include "../../Core/Uuid.h"
 #include "../ServerContext.h"
 
-#include <glog/logging.h>
 #include <stdio.h>
 
 #if defined(_MSC_VER)
--- a/OrthancServer/OrthancRestApi/OrthancRestChanges.cpp	Tue Aug 04 09:35:09 2015 +0200
+++ b/OrthancServer/OrthancRestApi/OrthancRestChanges.cpp	Tue Aug 04 10:01:31 2015 +0200
@@ -35,8 +35,6 @@
 
 #include "../ServerContext.h"
 
-#include <glog/logging.h>
-
 namespace Orthanc
 {
   // Changes API --------------------------------------------------------------
--- a/OrthancServer/OrthancRestApi/OrthancRestModalities.cpp	Tue Aug 04 09:35:09 2015 +0200
+++ b/OrthancServer/OrthancRestApi/OrthancRestModalities.cpp	Tue Aug 04 10:01:31 2015 +0200
@@ -35,6 +35,7 @@
 
 #include "../OrthancInitialization.h"
 #include "../../Core/HttpClient.h"
+#include "../../Core/Logging.h"
 #include "../FromDcmtkBridge.h"
 #include "../Scheduler/ServerJob.h"
 #include "../Scheduler/StoreScuCommand.h"
@@ -42,8 +43,6 @@
 #include "../QueryRetrieveHandler.h"
 #include "../ServerToolbox.h"
 
-#include <glog/logging.h>
-
 namespace Orthanc
 {
   /***************************************************************************
--- a/OrthancServer/OrthancRestApi/OrthancRestResources.cpp	Tue Aug 04 09:35:09 2015 +0200
+++ b/OrthancServer/OrthancRestApi/OrthancRestResources.cpp	Tue Aug 04 10:01:31 2015 +0200
@@ -33,13 +33,13 @@
 #include "../PrecompiledHeadersServer.h"
 #include "OrthancRestApi.h"
 
+#include "../../Core/Logging.h"
 #include "../ServerToolbox.h"
 #include "../FromDcmtkBridge.h"
 #include "../ResourceFinder.h"
 #include "../DicomFindQuery.h"
 #include "../ServerContext.h"
 
-#include <glog/logging.h>
 
 namespace Orthanc
 {
--- a/OrthancServer/OrthancRestApi/OrthancRestSystem.cpp	Tue Aug 04 09:35:09 2015 +0200
+++ b/OrthancServer/OrthancRestApi/OrthancRestSystem.cpp	Tue Aug 04 10:01:31 2015 +0200
@@ -39,8 +39,6 @@
 #include "../../Plugins/Engine/OrthancPlugins.h"
 #include "../ServerContext.h"
 
-#include <glog/logging.h>
-
 
 namespace Orthanc
 {
--- a/OrthancServer/ParsedDicomFile.cpp	Tue Aug 04 09:35:09 2015 +0200
+++ b/OrthancServer/ParsedDicomFile.cpp	Tue Aug 04 10:01:31 2015 +0200
@@ -84,6 +84,7 @@
 #include "FromDcmtkBridge.h"
 #include "ToDcmtkBridge.h"
 #include "Internals/DicomImageDecoder.h"
+#include "../Core/Logging.h"
 #include "../Core/Toolbox.h"
 #include "../Core/OrthancException.h"
 #include "../Core/ImageFormats/ImageBuffer.h"
@@ -134,7 +135,6 @@
 
 
 #include <boost/math/special_functions/round.hpp>
-#include <glog/logging.h>
 #include <dcmtk/dcmdata/dcostrmb.h>
 
 
--- a/OrthancServer/ResourceFinder.cpp	Tue Aug 04 09:35:09 2015 +0200
+++ b/OrthancServer/ResourceFinder.cpp	Tue Aug 04 10:01:31 2015 +0200
@@ -33,10 +33,10 @@
 #include "PrecompiledHeadersServer.h"
 #include "ResourceFinder.h"
 
+#include "../Core/Logging.h"
 #include "FromDcmtkBridge.h"
 #include "ServerContext.h"
 
-#include <glog/logging.h>
 #include <boost/algorithm/string/predicate.hpp>
 
 namespace Orthanc
--- a/OrthancServer/Scheduler/CallSystemCommand.cpp	Tue Aug 04 09:35:09 2015 +0200
+++ b/OrthancServer/Scheduler/CallSystemCommand.cpp	Tue Aug 04 10:01:31 2015 +0200
@@ -32,7 +32,7 @@
 
 #include "CallSystemCommand.h"
 
-#include <glog/logging.h>
+#include "../../Core/Logging.h"
 #include "../../Core/Toolbox.h"
 #include "../../Core/Uuid.h"
 
--- a/OrthancServer/Scheduler/DeleteInstanceCommand.cpp	Tue Aug 04 09:35:09 2015 +0200
+++ b/OrthancServer/Scheduler/DeleteInstanceCommand.cpp	Tue Aug 04 10:01:31 2015 +0200
@@ -32,7 +32,7 @@
 
 #include "DeleteInstanceCommand.h"
 
-#include <glog/logging.h>
+#include "../../Core/Logging.h"
 
 namespace Orthanc
 {
--- a/OrthancServer/Scheduler/ModifyInstanceCommand.cpp	Tue Aug 04 09:35:09 2015 +0200
+++ b/OrthancServer/Scheduler/ModifyInstanceCommand.cpp	Tue Aug 04 10:01:31 2015 +0200
@@ -32,7 +32,7 @@
 
 #include "ModifyInstanceCommand.h"
 
-#include <glog/logging.h>
+#include "../../Core/Logging.h"
 
 namespace Orthanc
 {
--- a/OrthancServer/Scheduler/ServerScheduler.cpp	Tue Aug 04 09:35:09 2015 +0200
+++ b/OrthancServer/Scheduler/ServerScheduler.cpp	Tue Aug 04 10:01:31 2015 +0200
@@ -33,8 +33,7 @@
 #include "ServerScheduler.h"
 
 #include "../../Core/OrthancException.h"
-
-#include <glog/logging.h>
+#include "../../Core/Logging.h"
 
 namespace Orthanc
 {
--- a/OrthancServer/Scheduler/StorePeerCommand.cpp	Tue Aug 04 09:35:09 2015 +0200
+++ b/OrthancServer/Scheduler/StorePeerCommand.cpp	Tue Aug 04 10:01:31 2015 +0200
@@ -32,10 +32,9 @@
 
 #include "StorePeerCommand.h"
 
+#include "../../Core/Logging.h"
 #include "../../Core/HttpClient.h"
 
-#include <glog/logging.h>
-
 namespace Orthanc
 {
   StorePeerCommand::StorePeerCommand(ServerContext& context,
--- a/OrthancServer/Scheduler/StoreScuCommand.cpp	Tue Aug 04 09:35:09 2015 +0200
+++ b/OrthancServer/Scheduler/StoreScuCommand.cpp	Tue Aug 04 10:01:31 2015 +0200
@@ -32,7 +32,7 @@
 
 #include "StoreScuCommand.h"
 
-#include <glog/logging.h>
+#include "../../Core/Logging.h"
 
 namespace Orthanc
 {
--- a/OrthancServer/ServerContext.cpp	Tue Aug 04 09:35:09 2015 +0200
+++ b/OrthancServer/ServerContext.cpp	Tue Aug 04 10:01:31 2015 +0200
@@ -34,11 +34,11 @@
 #include "ServerContext.h"
 
 #include "../Core/HttpServer/FilesystemHttpSender.h"
+#include "../Core/Logging.h"
 #include "FromDcmtkBridge.h"
 #include "ServerToolbox.h"
 #include "OrthancInitialization.h"
 
-#include <glog/logging.h>
 #include <EmbeddedResources.h>
 #include <dcmtk/dcmdata/dcfilefo.h>
 
--- a/OrthancServer/ServerIndex.cpp	Tue Aug 04 09:35:09 2015 +0200
+++ b/OrthancServer/ServerIndex.cpp	Tue Aug 04 10:01:31 2015 +0200
@@ -41,14 +41,15 @@
 #include "EmbeddedResources.h"
 #include "OrthancInitialization.h"
 #include "../Core/Toolbox.h"
+#include "../Core/Logging.h"
 #include "../Core/Uuid.h"
 #include "../Core/DicomFormat/DicomArray.h"
+
 #include "FromDcmtkBridge.h"
 #include "ServerContext.h"
 
 #include <boost/lexical_cast.hpp>
 #include <stdio.h>
-#include <glog/logging.h>
 
 static const uint64_t MEGA_BYTES = 1024 * 1024;
 
--- a/OrthancServer/ServerToolbox.cpp	Tue Aug 04 09:35:09 2015 +0200
+++ b/OrthancServer/ServerToolbox.cpp	Tue Aug 04 10:01:31 2015 +0200
@@ -33,10 +33,10 @@
 #include "PrecompiledHeadersServer.h"
 #include "ServerToolbox.h"
 
+#include "../Core/Logging.h"
 #include "../Core/OrthancException.h"
 
 #include <cassert>
-#include <glog/logging.h>
 
 namespace Orthanc
 {
--- a/OrthancServer/main.cpp	Tue Aug 04 09:35:09 2015 +0200
+++ b/OrthancServer/main.cpp	Tue Aug 04 10:01:31 2015 +0200
@@ -34,7 +34,6 @@
 #include "OrthancRestApi/OrthancRestApi.h"
 
 #include <fstream>
-#include <glog/logging.h>
 #include <boost/algorithm/string/predicate.hpp>
 
 #include "../Core/Logging.h"
--- a/Plugins/Engine/OrthancPluginDatabase.cpp	Tue Aug 04 09:35:09 2015 +0200
+++ b/Plugins/Engine/OrthancPluginDatabase.cpp	Tue Aug 04 10:01:31 2015 +0200
@@ -33,9 +33,9 @@
 #include "OrthancPluginDatabase.h"
 
 #include "../../Core/OrthancException.h"
+#include "../../Core/Logging.h"
 
 #include <cassert>
-#include <glog/logging.h>
 
 namespace Orthanc
 {
--- a/Plugins/Engine/OrthancPlugins.cpp	Tue Aug 04 09:35:09 2015 +0200
+++ b/Plugins/Engine/OrthancPlugins.cpp	Tue Aug 04 10:01:31 2015 +0200
@@ -35,6 +35,7 @@
 #include "../../Core/ChunkedBuffer.h"
 #include "../../Core/HttpServer/HttpToolbox.h"
 #include "../../Core/ImageFormats/PngWriter.h"
+#include "../../Core/Logging.h"
 #include "../../Core/OrthancException.h"
 #include "../../Core/Toolbox.h"
 #include "../../OrthancServer/OrthancInitialization.h"
@@ -42,7 +43,6 @@
 #include "../../OrthancServer/ServerToolbox.h"
 
 #include <boost/regex.hpp> 
-#include <glog/logging.h>
 
 namespace Orthanc
 {
--- a/Plugins/Engine/PluginsManager.cpp	Tue Aug 04 09:35:09 2015 +0200
+++ b/Plugins/Engine/PluginsManager.cpp	Tue Aug 04 10:01:31 2015 +0200
@@ -34,8 +34,8 @@
 
 #include "../../Core/Toolbox.h"
 #include "../../Core/HttpServer/HttpOutput.h"
+#include "../../Core/Logging.h"
 
-#include <glog/logging.h>
 #include <cassert>
 #include <memory>
 #include <boost/filesystem.hpp>
--- a/Plugins/Engine/SharedLibrary.cpp	Tue Aug 04 09:35:09 2015 +0200
+++ b/Plugins/Engine/SharedLibrary.cpp	Tue Aug 04 10:01:31 2015 +0200
@@ -32,6 +32,7 @@
 
 #include "SharedLibrary.h"
 
+#include "../../Core/Logging.h"
 #include "../../Core/Toolbox.h"
 
 #if defined(_WIN32)
@@ -42,8 +43,6 @@
 #error Support your platform here
 #endif
 
-#include <glog/logging.h>
-
 namespace Orthanc
 {
   SharedLibrary::SharedLibrary(const std::string& path) : 
--- a/UnitTestsSources/FileStorageTests.cpp	Tue Aug 04 09:35:09 2015 +0200
+++ b/UnitTestsSources/FileStorageTests.cpp	Tue Aug 04 10:01:31 2015 +0200
@@ -34,10 +34,10 @@
 #include "gtest/gtest.h"
 
 #include <ctype.h>
-#include <glog/logging.h>
 
 #include "../Core/FileStorage/FilesystemStorage.h"
 #include "../OrthancServer/ServerIndex.h"
+#include "../Core/Logging.h"
 #include "../Core/Toolbox.h"
 #include "../Core/OrthancException.h"
 #include "../Core/Uuid.h"
--- a/UnitTestsSources/MemoryCacheTests.cpp	Tue Aug 04 09:35:09 2015 +0200
+++ b/UnitTestsSources/MemoryCacheTests.cpp	Tue Aug 04 10:01:31 2015 +0200
@@ -33,13 +33,14 @@
 #include "PrecompiledHeadersUnitTests.h"
 #include "gtest/gtest.h"
 
-#include <glog/logging.h>
 #include <memory>
 #include <boost/thread.hpp>
 #include <boost/lexical_cast.hpp>
-#include "../Core/IDynamicObject.h"
+
 #include "../Core/Cache/MemoryCache.h"
 #include "../Core/Cache/SharedArchive.h"
+#include "../Core/IDynamicObject.h"
+#include "../Core/Logging.h"
 
 
 TEST(LRU, Basic)
--- a/UnitTestsSources/MultiThreadingTests.cpp	Tue Aug 04 09:35:09 2015 +0200
+++ b/UnitTestsSources/MultiThreadingTests.cpp	Tue Aug 04 10:01:31 2015 +0200
@@ -32,10 +32,8 @@
 
 #include "PrecompiledHeadersUnitTests.h"
 #include "gtest/gtest.h"
-#include <glog/logging.h>
 
 #include "../OrthancServer/Scheduler/ServerScheduler.h"
-
 #include "../Core/OrthancException.h"
 #include "../Core/Toolbox.h"
 #include "../Core/MultiThreading/Locker.h"
--- a/UnitTestsSources/PluginsTests.cpp	Tue Aug 04 09:35:09 2015 +0200
+++ b/UnitTestsSources/PluginsTests.cpp	Tue Aug 04 10:01:31 2015 +0200
@@ -33,8 +33,6 @@
 #include "PrecompiledHeadersUnitTests.h"
 #include "gtest/gtest.h"
 
-#include <glog/logging.h>
-
 #include "../Plugins/Engine/PluginsManager.h"
 
 using namespace Orthanc;
--- a/UnitTestsSources/RestApiTests.cpp	Tue Aug 04 09:35:09 2015 +0200
+++ b/UnitTestsSources/RestApiTests.cpp	Tue Aug 04 10:01:31 2015 +0200
@@ -34,10 +34,10 @@
 #include "gtest/gtest.h"
 
 #include <ctype.h>
-#include <glog/logging.h>
 
 #include "../Core/ChunkedBuffer.h"
 #include "../Core/HttpClient.h"
+#include "../Core/Logging.h"
 #include "../Core/RestApi/RestApi.h"
 #include "../Core/Uuid.h"
 #include "../Core/OrthancException.h"
--- a/UnitTestsSources/ServerIndexTests.cpp	Tue Aug 04 09:35:09 2015 +0200
+++ b/UnitTestsSources/ServerIndexTests.cpp	Tue Aug 04 10:01:31 2015 +0200
@@ -33,15 +33,15 @@
 #include "PrecompiledHeadersUnitTests.h"
 #include "gtest/gtest.h"
 
+#include "../Core/DicomFormat/DicomNullValue.h"
+#include "../Core/FileStorage/FilesystemStorage.h"
+#include "../Core/Logging.h"
+#include "../Core/Uuid.h"
 #include "../OrthancServer/DatabaseWrapper.h"
 #include "../OrthancServer/ServerContext.h"
 #include "../OrthancServer/ServerIndex.h"
-#include "../Core/Uuid.h"
-#include "../Core/DicomFormat/DicomNullValue.h"
-#include "../Core/FileStorage/FilesystemStorage.h"
 
 #include <ctype.h>
-#include <glog/logging.h>
 #include <algorithm>
 
 using namespace Orthanc;