orthanc-object-storage: Aws/AwsS3StoragePlugin.cpp comparison

comparison Aws/AwsS3StoragePlugin.cpp @ 120:12ea59c97c40

sync orthanc folder + show timings + EnableAwsSdkLogs

author	Alain Mazy <am@osimis.io>
date	Tue, 21 Nov 2023 09:46:51 +0100
parents	78c075412ab4
children	addccb7ad900 3e9cced85a5b

comparison

equal deleted inserted replaced

-:ca68456d789a
+:12ea59c97c40
 * You should have received a copy of the GNU Affero General Public License
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
 **/
 #include "AwsS3StoragePlugin.h"
+#include <Logging.h>
 #include <aws/core/Aws.h>
 #include <aws/s3/S3Client.h>
 #include <aws/s3/model/PutObjectRequest.h>
 #include <aws/s3/model/GetObjectRequest.h>
 #include <aws/s3/model/ListObjectsRequest.h>
 #include <aws/s3/model/DeleteObjectRequest.h>
 #include <aws/core/auth/AWSCredentialsProvider.h>
 #include <aws/core/utils/HashingUtils.h>
+#include <aws/core/utils/logging/DefaultLogSystem.h>
+#include <aws/core/utils/logging/DefaultCRTLogSystem.h>
+#include <aws/core/utils/logging/AWSLogging.h>
 #include <aws/core/utils/memory/stl/AWSStreamFwd.h>
 #include <aws/core/utils/memory/stl/AWSStringStream.h>
 #include <aws/core/utils/memory/AWSMemory.h>
 #include <aws/core/utils/stream/PreallocatedStreamBuf.h>
 #include <aws/core/utils/StringUtils.h>
 #include <aws/transfer/TransferManager.h>
 #include <aws/crt/Api.h>
+#include <iostream>
 #include <fstream>
 #include <boost/lexical_cast.hpp>
 #include <boost/interprocess/streams/bufferstream.hpp>
 #include <iostream>
 }
 static std::unique_ptr<Aws::Crt::ApiHandle>  api_;
 static std::unique_ptr<Aws::SDKOptions>  sdkOptions_;
+#include <stdarg.h>
+class AwsOrthancLogger : public Aws::Utils::Logging::LogSystemInterface
+{
+public:
+virtual ~AwsOrthancLogger() {}
+/**
+* Gets the currently configured log level for this logger.
+*/
+virtual Aws::Utils::Logging::LogLevel GetLogLevel() const
+{
+return Aws::Utils::Logging::LogLevel::Trace;
+}
+/**
+* Does a printf style output to the output stream. Don't use this, it's unsafe. See LogStream
+*/
+virtual void Log(Aws::Utils::Logging::LogLevel logLevel, const char* tag, const char* formatStr, ...)
+{
+Aws::StringStream ss;
+va_list args;
+va_start(args, formatStr);
+va_list tmp_args; //unfortunately you cannot consume a va_list twice
+va_copy(tmp_args, args); //so we have to copy it
+#ifdef _WIN32
+const int requiredLength = _vscprintf(formatStr, tmp_args) + 1;
+#else
+const int requiredLength = vsnprintf(nullptr, 0, formatStr, tmp_args) + 1;
+#endif
+va_end(tmp_args);
+char outputBuff[requiredLength];
+#ifdef _WIN32
+vsnprintf_s(outputBuff, requiredLength, _TRUNCATE, formatStr, args);
+#else
+vsnprintf(outputBuff, requiredLength, formatStr, args);
+#endif // _WIN32
+if (logLevel == Aws::Utils::Logging::LogLevel::Debug || logLevel == Aws::Utils::Logging::LogLevel::Trace)
+{
+LOG(INFO) << reinterpret_cast<const char*>(&outputBuff[0]);
+}
+else if (logLevel == Aws::Utils::Logging::LogLevel::Warn)
+{
+LOG(WARNING) << reinterpret_cast<const char*>(&outputBuff[0]);
+}
+else
+{
+LOG(ERROR) << reinterpret_cast<const char*>(&outputBuff[0]);
+}
+va_end(args);
+}
+/**
+* Writes the stream to the output stream.
+*/
+virtual void LogStream(Aws::Utils::Logging::LogLevel logLevel, const char* tag, const Aws::OStringStream &messageStream)
+{
+if (logLevel == Aws::Utils::Logging::LogLevel::Debug || logLevel == Aws::Utils::Logging::LogLevel::Trace)
+{
+LOG(INFO) << tag << messageStream.str();
+}
+else if (logLevel == Aws::Utils::Logging::LogLevel::Warn)
+{
+LOG(WARNING) << tag << messageStream.str();
+}
+else
+{
+LOG(ERROR) << tag << messageStream.str();
+}
+}
+/**
+* Writes any buffered messages to the underlying device if the logger supports buffering.
+*/
+virtual void Flush() {}
+};
 IStorage* AwsS3StoragePluginFactory::CreateStorage(const std::string& nameForLogs, const OrthancPlugins::OrthancConfiguration& orthancConfig)
 {
 if (sdkOptions_.get() != NULL)
 {
 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls, "Cannot initialize twice");
 }
-api_.reset(new Aws::Crt::ApiHandle);
-sdkOptions_.reset(new Aws::SDKOptions);
-sdkOptions_->cryptoOptions.initAndCleanupOpenSSL = false;  // Done by the Orthanc framework
-sdkOptions_->httpOptions.initAndCleanupCurl = false;  // Done by the Orthanc framework
-Aws::InitAPI(*sdkOptions_);
 bool enableLegacyStorageStructure;
 bool storageContainsUnknownFiles;
 if (!orthancConfig.IsSection(GetConfigurationSectionName()))
 const std::string endpoint = pluginSection.GetStringValue("Endpoint", "");
 const unsigned int connectTimeout = pluginSection.GetUnsignedIntegerValue("ConnectTimeout", 30);
 const unsigned int requestTimeout = pluginSection.GetUnsignedIntegerValue("RequestTimeout", 1200);
 const bool virtualAddressing = pluginSection.GetBooleanValue("VirtualAddressing", true);
+const bool enableAwsSdkLogs = pluginSection.GetBooleanValue("EnableAwsSdkLogs", false);
 const std::string caFile = orthancConfig.GetStringValue("HttpsCACertificates", "");
+api_.reset(new Aws::Crt::ApiHandle);
+sdkOptions_.reset(new Aws::SDKOptions);
+sdkOptions_->cryptoOptions.initAndCleanupOpenSSL = false;  // Done by the Orthanc framework
+sdkOptions_->httpOptions.initAndCleanupCurl = false;  // Done by the Orthanc framework
+if (enableAwsSdkLogs)
+{
+// Set up logging
+Aws::Utils::Logging::InitializeAWSLogging(Aws::MakeShared<AwsOrthancLogger>(ALLOCATION_TAG));
+// strangely, this seems to disable logging !!!! sdkOptions_->loggingOptions.logLevel = Aws::Utils::Logging::LogLevel::Trace;
+}
+Aws::InitAPI(*sdkOptions_);
 try
 {
 Aws::Client::ClientConfiguration configuration;
 configuration.region = region.c_str();

Mercurial > hg > orthanc-object-storage

comparison Aws/AwsS3StoragePlugin.cpp @ 120:12ea59c97c40