# HG changeset patch # User Sebastien Jodogne # Date 1610194386 -3600 # Node ID 453cd3a5a0dadacd13c9158f5b25e71f26eeffee # Parent eddb212b2df9e1817b97bb9a33b58e1692177871 better warning about no support of file ranges in storage area diff -r eddb212b2df9 -r 453cd3a5a0da OrthancServer/Plugins/Engine/OrthancPlugins.cpp --- a/OrthancServer/Plugins/Engine/OrthancPlugins.cpp Fri Jan 08 18:53:33 2021 +0100 +++ b/OrthancServer/Plugins/Engine/OrthancPlugins.cpp Sat Jan 09 13:13:06 2021 +0100 @@ -369,10 +369,6 @@ readWhole_(callbacks.readWhole), readRange_(callbacks.readRange) { - if (readRange_) - { - LOG(WARNING) << "Performance warning: The storage area plugin doesn't implement reading of file ranges"; - } } virtual void Read(std::string& content, @@ -410,6 +406,11 @@ _OrthancPluginRegisterStorageArea2 callbacks2_; PluginsErrorDictionary& errorDictionary_; + static void WarnNoReadRange() + { + LOG(WARNING) << "Performance warning: The storage area plugin doesn't implement reading of file ranges"; + } + public: StorageAreaFactory(SharedLibrary& sharedLibrary, const _OrthancPluginRegisterStorageArea& callbacks, @@ -419,8 +420,7 @@ callbacks_(callbacks), errorDictionary_(errorDictionary) { - LOG(WARNING) << "Performance warning: The storage area plugin doesn't " - << "use OrthancPluginRegisterStorageArea2()"; + WarnNoReadRange(); } StorageAreaFactory(SharedLibrary& sharedLibrary, @@ -431,6 +431,10 @@ callbacks2_(callbacks), errorDictionary_(errorDictionary) { + if (callbacks.readRange == NULL) + { + WarnNoReadRange(); + } } SharedLibrary& GetSharedLibrary()