Skip to content

Commit f9f70b0

Browse files
njwright-avevanjwright-aveva
authored
Switch logger_mt with severity_logger_mt<severity_level> (#12)
Switched logger_mt with severity_logger_mt<severity_level>
1 parent 28f7f4a commit f9f70b0

25 files changed

+64
-62
lines changed

‎include/AVEVA/RocksDB/Plugin/Azure/BlobFilesystem.hpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#include "AVEVA/RocksDB/Plugin/Azure/LockFile.hpp"
66
#include "AVEVA/RocksDB/Plugin/Azure/Impl/BlobFilesystemImpl.hpp"
77

8-
#include <boost/log/sources/logger.hpp>
8+
#include <boost/log/trivial.hpp>
99
#include <boost/intrusive/list.hpp>
1010

1111
#include <rocksdb/file_system.h>
@@ -18,13 +18,13 @@ namespace AVEVA::RocksDB::Plugin::Azure
1818
class BlobFilesystem final : public rocksdb::FileSystemWrapper
1919
{
2020
std::unique_ptr<Impl::BlobFilesystemImpl> m_filesystem;
21-
std::shared_ptr<boost::log::sources::logger_mt> m_logger;
21+
std::shared_ptr<boost::log::sources::severity_logger_mt<boost::log::trivial::severity_level>> m_logger;
2222
boost::intrusive::list<Azure::LockFile, boost::intrusive::constant_time_size<false>> m_lockFiles;
2323

2424
public:
2525
BlobFilesystem(std::shared_ptr<rocksdb::FileSystem> rocksdbFs,
2626
std::unique_ptr<Impl::BlobFilesystemImpl> filesystem,
27-
std::shared_ptr<boost::log::sources::logger_mt> logger);
27+
std::shared_ptr<boost::log::sources::severity_logger_mt<boost::log::trivial::severity_level>> logger);
2828
virtual ~BlobFilesystem() override;
2929
BlobFilesystem(const BlobFilesystem&) = delete;
3030
BlobFilesystem& operator=(const BlobFilesystem&) = delete;

‎include/AVEVA/RocksDB/Plugin/Azure/Impl/BlobFilesystemImpl.hpp‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
#include <azure/storage/blobs/blob_service_client.hpp>
1818
#include <azure/storage/blobs/blob_container_client.hpp>
19-
#include <boost/log/sources/logger.hpp>
19+
#include <boost/log/trivial.hpp>
2020

2121
#include <cstdint>
2222
#include <memory>
@@ -40,7 +40,7 @@ namespace AVEVA::RocksDB::Plugin::Azure::Impl
4040
::Azure::Storage::Blobs::BlobContainerClient ContainerClient;
4141
};
4242

43-
std::shared_ptr<boost::log::sources::logger_mt> m_logger;
43+
std::shared_ptr<boost::log::sources::severity_logger_mt<boost::log::trivial::severity_level>> m_logger;
4444
int64_t m_dataFileInitialSize;
4545
int64_t m_dataFileBufferSize;
4646
std::unordered_map<std::string, ServiceContainer, Core::StringHash, Core::StringEqual> m_clients;
@@ -55,7 +55,7 @@ namespace AVEVA::RocksDB::Plugin::Azure::Impl
5555
const std::string& storageAccountKey,
5656
int64_t dataFileInitialSize,
5757
int64_t dataFileBufferSize,
58-
std::shared_ptr<boost::log::sources::logger_mt> logger,
58+
std::shared_ptr<boost::log::sources::severity_logger_mt<boost::log::trivial::severity_level>> logger,
5959
std::optional<std::string_view> cachePath = {},
6060
size_t maxCacheSize = Configuration::MaxCacheSize);
6161
BlobFilesystemImpl(const std::string& name,
@@ -65,7 +65,7 @@ namespace AVEVA::RocksDB::Plugin::Azure::Impl
6565
const std::string& tenantId,
6666
int64_t dataFileInitialSize,
6767
int64_t dataFileBufferSize,
68-
std::shared_ptr<boost::log::sources::logger_mt> logger,
68+
std::shared_ptr<boost::log::sources::severity_logger_mt<boost::log::trivial::severity_level>> logger,
6969
std::optional<std::string_view> cachePath = {},
7070
size_t maxCacheSize = Configuration::MaxCacheSize);
7171
BlobFilesystemImpl(const std::string& name,
@@ -76,21 +76,21 @@ namespace AVEVA::RocksDB::Plugin::Azure::Impl
7676
const std::string& accessToken,
7777
int64_t dataFileInitialSize,
7878
int64_t dataFileBufferSize,
79-
std::shared_ptr<boost::log::sources::logger_mt> logger,
79+
std::shared_ptr<boost::log::sources::severity_logger_mt<boost::log::trivial::severity_level>> logger,
8080
std::optional<std::string_view> cachePath = {},
8181
size_t maxCacheSize = Configuration::MaxCacheSize);
8282
BlobFilesystemImpl(Models::ChainedCredentialInfo primary,
8383
std::optional<Models::ChainedCredentialInfo> backup,
8484
int64_t dataFileInitialSize,
8585
int64_t dataFileBufferSize,
86-
std::shared_ptr<boost::log::sources::logger_mt> logger,
86+
std::shared_ptr<boost::log::sources::severity_logger_mt<boost::log::trivial::severity_level>> logger,
8787
std::optional<std::string_view> cachePath = {},
8888
size_t maxCacheSize = Configuration::MaxCacheSize);
8989
BlobFilesystemImpl(Models::ServicePrincipalStorageInfo primary,
9090
std::optional<Models::ServicePrincipalStorageInfo> backup,
9191
int64_t dataFileInitialSize,
9292
int64_t dataFileBufferSize,
93-
std::shared_ptr<boost::log::sources::logger_mt> logger,
93+
std::shared_ptr<boost::log::sources::severity_logger_mt<boost::log::trivial::severity_level>> logger,
9494
std::optional<std::string_view> cachePath = {},
9595
size_t maxCacheSize = Configuration::MaxCacheSize);
9696

@@ -115,7 +115,7 @@ namespace AVEVA::RocksDB::Plugin::Azure::Impl
115115
size_t GetLeaseClientCount();
116116
void RenameFile(const std::string& fromFilePath, const std::string& toFilePath) const;
117117
private:
118-
BlobFilesystemImpl(std::shared_ptr<boost::log::sources::logger_mt>&& logger, int64_t dataFileInitialSize = 0, int64_t dataFileBufferSize = 0);
118+
BlobFilesystemImpl(std::shared_ptr<boost::log::sources::severity_logger_mt<boost::log::trivial::severity_level>>&& logger, int64_t dataFileInitialSize = 0, int64_t dataFileBufferSize = 0);
119119
[[nodiscard]] const ::Azure::Storage::Blobs::BlobContainerClient& GetContainer(std::string_view prefix) const;
120120
void RenewLease(std::stop_token stopToken);
121121
};

‎include/AVEVA/RocksDB/Plugin/Azure/Impl/ReadWriteFileImpl.hpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#include "AVEVA/RocksDB/Plugin/Azure/Impl/BufferChunkInfo.hpp"
88
#include "AVEVA/RocksDB/Plugin/Azure/Impl/Configuration.hpp"
99

10-
#include <boost/log/sources/logger.hpp>
10+
#include <boost/log/trivial.hpp>
1111

1212
#include <cstdint>
1313
#include <string_view>
@@ -21,7 +21,7 @@ namespace AVEVA::RocksDB::Plugin::Azure::Impl
2121
std::string m_name;
2222
std::shared_ptr<Core::BlobClient> m_blobClient;
2323
std::shared_ptr<Core::FileCache> m_fileCache;
24-
std::shared_ptr<boost::log::sources::logger_mt> m_logger;
24+
std::shared_ptr<boost::log::sources::severity_logger_mt<boost::log::trivial::severity_level>> m_logger;
2525

2626
int64_t m_size;
2727
int64_t m_syncSize;
@@ -34,7 +34,7 @@ namespace AVEVA::RocksDB::Plugin::Azure::Impl
3434
ReadWriteFileImpl(std::string_view name,
3535
std::shared_ptr<Core::BlobClient> blobClient,
3636
std::shared_ptr<Core::FileCache> fileCache,
37-
std::shared_ptr<boost::log::sources::logger_mt> logger);
37+
std::shared_ptr<boost::log::sources::severity_logger_mt<boost::log::trivial::severity_level>> logger);
3838
~ReadWriteFileImpl();
3939
ReadWriteFileImpl(const ReadWriteFileImpl&) = delete;
4040
ReadWriteFileImpl& operator=(const ReadWriteFileImpl&) = delete;

‎include/AVEVA/RocksDB/Plugin/Azure/Impl/WriteableFileImpl.hpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#include "AVEVA/RocksDB/Plugin/Core/FileCache.hpp"
77

88
#include <azure/storage/blobs/page_blob_client.hpp>
9-
#include <boost/log/sources/logger.hpp>
9+
#include <boost/log/trivial.hpp>
1010

1111
#include <cstdint>
1212
#include <string>
@@ -20,7 +20,7 @@ namespace AVEVA::RocksDB::Plugin::Azure::Impl
2020
int64_t m_bufferSize;
2121
std::shared_ptr<Core::BlobClient> m_blobClient;
2222
std::shared_ptr<Core::FileCache> m_fileCache;
23-
std::shared_ptr<boost::log::sources::logger_mt> m_logger;
23+
std::shared_ptr<boost::log::sources::severity_logger_mt<boost::log::trivial::severity_level>> m_logger;
2424

2525
int64_t m_lastPageOffset;
2626
int64_t m_size;
@@ -35,7 +35,7 @@ namespace AVEVA::RocksDB::Plugin::Azure::Impl
3535
WriteableFileImpl(std::string_view name,
3636
std::shared_ptr<Core::BlobClient> blobClient,
3737
std::shared_ptr<Core::FileCache> fileCache,
38-
std::shared_ptr<boost::log::sources::logger_mt> logger,
38+
std::shared_ptr<boost::log::sources::severity_logger_mt<boost::log::trivial::severity_level>> logger,
3939
int64_t bufferSize = Configuration::PageBlob::DefaultBufferSize);
4040
~WriteableFileImpl();
4141
WriteableFileImpl(const WriteableFileImpl&) = delete;

‎include/AVEVA/RocksDB/Plugin/Azure/Plugin.hpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#include "AVEVA/RocksDB/Plugin/Azure/Models/ServicePrincipalStorageInfo.hpp"
77
#include "AVEVA/RocksDB/Plugin/Azure/Models/ChainedCredentialInfo.hpp"
88

9-
#include <boost/log/sources/logger.hpp>
9+
#include <boost/log/trivial.hpp>
1010
#include <rocksdb/env.h>
1111

1212
#include <memory>
@@ -21,7 +21,7 @@ namespace AVEVA::RocksDB::Plugin::Azure
2121
std::shared_ptr<rocksdb::Env>* guard,
2222
Models::ServicePrincipalStorageInfo primary,
2323
std::optional<Models::ServicePrincipalStorageInfo> backup,
24-
std::shared_ptr<boost::log::sources::logger_mt> logger,
24+
std::shared_ptr<boost::log::sources::severity_logger_mt<boost::log::trivial::severity_level>> logger,
2525
int64_t dataFileBufferSize = Impl::Configuration::PageBlob::DefaultBufferSize,
2626
int64_t dataFileInitialSize = Impl::Configuration::PageBlob::DefaultSize,
2727
std::optional<std::string_view> cachePath = {},
@@ -31,7 +31,7 @@ namespace AVEVA::RocksDB::Plugin::Azure
3131
std::shared_ptr<rocksdb::Env>* guard,
3232
Models::ChainedCredentialInfo primary,
3333
std::optional<Models::ChainedCredentialInfo> backup,
34-
std::shared_ptr<boost::log::sources::logger_mt> logger,
34+
std::shared_ptr<boost::log::sources::severity_logger_mt<boost::log::trivial::severity_level>> logger,
3535
int64_t dataFileBufferSize = Impl::Configuration::PageBlob::DefaultBufferSize,
3636
int64_t dataFileInitialSize = Impl::Configuration::PageBlob::DefaultSize,
3737
std::optional<std::string_view> cachePath = {},

‎include/AVEVA/RocksDB/Plugin/Azure/ReadWriteFile.hpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,17 @@
44
#pragma once
55
#include "AVEVA/RocksDB/Plugin/Azure/Impl/ReadWriteFileImpl.hpp"
66

7-
#include <boost/log/sources/logger.hpp>
7+
#include <boost/log/trivial.hpp>
88
#include <rocksdb/file_system.h>
99
namespace AVEVA::RocksDB::Plugin::Azure
1010
{
1111
class ReadWriteFile final : public rocksdb::FSRandomRWFile
1212
{
1313
Impl::ReadWriteFileImpl m_file;
14-
std::shared_ptr<boost::log::sources::logger_mt> m_logger;
14+
std::shared_ptr<boost::log::sources::severity_logger_mt<boost::log::trivial::severity_level>> m_logger;
1515

1616
public:
17-
ReadWriteFile(Impl::ReadWriteFileImpl file, std::shared_ptr<boost::log::sources::logger_mt> logger);
17+
ReadWriteFile(Impl::ReadWriteFileImpl file, std::shared_ptr<boost::log::sources::severity_logger_mt<boost::log::trivial::severity_level>> logger);
1818
virtual rocksdb::IOStatus Write(uint64_t offset, const rocksdb::Slice& data, const rocksdb::IOOptions& options, rocksdb::IODebugContext* dbg) override;
1919
virtual rocksdb::IOStatus Read(uint64_t offset, size_t n, const rocksdb::IOOptions& options, rocksdb::Slice* result, char* scratch, rocksdb::IODebugContext* dbg) const override;
2020
virtual rocksdb::IOStatus Flush(const rocksdb::IOOptions& options, rocksdb::IODebugContext* dbg) override;

‎include/AVEVA/RocksDB/Plugin/Azure/WriteableFile.hpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
#include "AVEVA/RocksDB/Plugin/Azure/Impl/WriteableFileImpl.hpp"
55

6-
#include <boost/log/sources/logger.hpp>
6+
#include <boost/log/trivial.hpp>
77
#include <rocksdb/file_system.h>
88

99
#include <memory>
@@ -12,10 +12,10 @@ namespace AVEVA::RocksDB::Plugin::Azure
1212
class WriteableFile final : public rocksdb::FSWritableFile
1313
{
1414
Impl::WriteableFileImpl m_file;
15-
std::shared_ptr<boost::log::sources::logger_mt> m_logger;
15+
std::shared_ptr<boost::log::sources::severity_logger_mt<boost::log::trivial::severity_level>> m_logger;
1616

1717
public:
18-
WriteableFile(Impl::WriteableFileImpl file, std::shared_ptr<boost::log::sources::logger_mt> logger);
18+
WriteableFile(Impl::WriteableFileImpl file, std::shared_ptr<boost::log::sources::severity_logger_mt<boost::log::trivial::severity_level>> logger);
1919
virtual rocksdb::IOStatus Append(const rocksdb::Slice& data, const rocksdb::IOOptions& options, rocksdb::IODebugContext* dbg) override;
2020
virtual rocksdb::IOStatus Close(const rocksdb::IOOptions&, rocksdb::IODebugContext*) override;
2121
virtual rocksdb::IOStatus Flush(const rocksdb::IOOptions& options, rocksdb::IODebugContext* dbg) override;

‎include/AVEVA/RocksDB/Plugin/Core/FileCache.hpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#include "AVEVA/RocksDB/Plugin/Core/Util.hpp"
99

1010
#include <boost/intrusive/list.hpp>
11-
#include <boost/log/sources/logger.hpp>
11+
#include <boost/log/trivial.hpp>
1212

1313
#include <cstdint>
1414
#include <filesystem>
@@ -28,7 +28,7 @@ namespace AVEVA::RocksDB::Plugin::Core
2828
int64_t m_maxSize;
2929
std::shared_ptr<ContainerClient> m_containerClient;
3030
std::shared_ptr<Filesystem> m_filesystem;
31-
std::shared_ptr<boost::log::sources::logger_mt> m_logger;
31+
std::shared_ptr<boost::log::sources::severity_logger_mt<boost::log::trivial::severity_level>> m_logger;
3232

3333
std::mutex m_mutex;
3434
std::stop_source m_stopSource;
@@ -42,7 +42,7 @@ namespace AVEVA::RocksDB::Plugin::Core
4242
int64_t maxCacheSize,
4343
std::shared_ptr<ContainerClient> containerClient,
4444
std::shared_ptr<Filesystem> filesystem,
45-
std::shared_ptr<boost::log::sources::logger_mt> logger);
45+
std::shared_ptr<boost::log::sources::severity_logger_mt<boost::log::trivial::severity_level>> logger);
4646
~FileCache();
4747
FileCache(const FileCache&) = delete;
4848
FileCache& operator=(const FileCache&) = delete;

‎include/AVEVA/RocksDB/Plugin/Core/LocalFilesystem.hpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,17 @@
44
#pragma once
55
#include "AVEVA/RocksDB/Plugin/Core/Filesystem.hpp"
66

7-
#include <boost/log/sources/logger.hpp>
7+
#include <boost/log/trivial.hpp>
88

99
#include <memory>
1010
namespace AVEVA::RocksDB::Plugin::Core
1111
{
1212
class LocalFilesystem final : public Filesystem
1313
{
1414
private:
15-
std::shared_ptr<boost::log::sources::logger_mt> m_logger;
15+
std::shared_ptr<boost::log::sources::severity_logger_mt<boost::log::trivial::severity_level>> m_logger;
1616
public:
17-
explicit LocalFilesystem(std::shared_ptr<boost::log::sources::logger_mt> logger);
17+
explicit LocalFilesystem(std::shared_ptr<boost::log::sources::severity_logger_mt<boost::log::trivial::severity_level>> logger);
1818
virtual std::unique_ptr<File> Open(const std::filesystem::path& path) override;
1919
virtual bool DeleteFile(const std::filesystem::path& path) override;
2020
virtual bool DeleteDir(const std::filesystem::path& path) override;

‎src/AVEVA/RocksDB/Plugin/Azure/BlobFilesystem.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
namespace AVEVA::RocksDB::Plugin::Azure
1515
{
1616
using namespace boost::log::trivial;
17-
BlobFilesystem::BlobFilesystem(std::shared_ptr<rocksdb::FileSystem> rocksdbFs, std::unique_ptr<Impl::BlobFilesystemImpl> filesystem, std::shared_ptr<boost::log::sources::logger_mt> logger)
17+
BlobFilesystem::BlobFilesystem(std::shared_ptr<rocksdb::FileSystem> rocksdbFs, std::unique_ptr<Impl::BlobFilesystemImpl> filesystem, std::shared_ptr<boost::log::sources::severity_logger_mt<boost::log::trivial::severity_level>> logger)
1818
: rocksdb::FileSystemWrapper(std::move(rocksdbFs)),
1919
m_filesystem(std::move(filesystem)),
2020
m_logger(std::move(logger))

0 commit comments

Comments
 (0)