MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-10-01 05:08:59 +02:00
Code Issues Releases Wiki Activity

ircd::db: Rename database::logs to database::logger.

Browse source
This commit is contained in:
Jason Volk 2018-12-10 13:26:46 -08:00
parent f7792c085e
commit c3560d4890
3 changed files with 27 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/ircd/db/database/database.h
View file

@ -76,7 +76,7 @@ struct ircd::db::database
struct options;
struct events;
struct stats;
struct logs;
struct logger;
struct mergeop;
struct snapshot;
struct comparator;
@ -93,8 +93,8 @@ struct ircd::db::database
std::string optstr;
bool fsck, read_only;
std::shared_ptr<struct env> env;
std::shared_ptr<struct logs> logs;
std::shared_ptr<struct stats> stats;
std::shared_ptr<struct logger> logger;
std::shared_ptr<struct events> events;
std::shared_ptr<struct mergeop> mergeop;
std::shared_ptr<rocksdb::SstFileManager> ssts;

10
include/ircd/db/database/logs.h → include/ircd/db/database/logger.h
View file

@ -9,14 +9,14 @@
// full license for this software is available in the LICENSE file.
#pragma once
#define HAVE_IRCD_DB_DATABASE_LOGS_H
#define HAVE_IRCD_DB_DATABASE_LOGGER_H
// This file is not part of the standard include stack because it requires
// RocksDB symbols which we cannot forward declare. It is used internally
// and does not need to be included by general users of IRCd.
struct ircd::db::database::logs final
:std::enable_shared_from_this<struct database::logs>
struct ircd::db::database::logger final
:std::enable_shared_from_this<struct database::logger>
,rocksdb::Logger
{
database *d;
@ -27,6 +27,6 @@ struct ircd::db::database::logs final
rocksdb::Status Close() noexcept override;
logs(database *const &d);
~logs() noexcept override;
logger(database *const &d);
~logger() noexcept override;
};

40
ircd/db.cc
View file

@ -36,7 +36,7 @@
#include <ircd/db/database/mergeop.h>
#include <ircd/db/database/events.h>
#include <ircd/db/database/stats.h>
#include <ircd/db/database/logs.h>
#include <ircd/db/database/logger.h>
#include <ircd/db/database/column.h>
#include <ircd/db/database/txn.h>
#include <ircd/db/database/cache.h>
@ -841,14 +841,14 @@ try
{
std::make_shared<struct env>(this)
}
,logs
{
std::make_shared<struct logs>(this)
}
,stats
{
std::make_shared<struct stats>(this)
}
,logger
{
std::make_shared<struct logger>(this)
}
,events
{
std::make_shared<struct events>(this)
@ -863,7 +863,7 @@ try
// note: a pthread internally in rocksdb which does not use our callbacks
// note: we gave in the supplied env. we really don't want that.
//rocksdb::NewSstFileManager(env.get(), logs, {}, 0, true, nullptr, 0.05)
//rocksdb::NewSstFileManager(env.get(), logger, {}, 0, true, nullptr, 0.05)
}
,row_cache
{
@ -972,9 +972,9 @@ try
opts->sst_file_manager = this->ssts;
// Setup logging
logs->SetInfoLogLevel(ircd::debugmode? rocksdb::DEBUG_LEVEL : rocksdb::WARN_LEVEL);
opts->info_log_level = logs->GetInfoLogLevel();
opts->info_log = logs;
logger->SetInfoLogLevel(ircd::debugmode? rocksdb::DEBUG_LEVEL : rocksdb::WARN_LEVEL);
opts->info_log_level = logger->GetInfoLogLevel();
opts->info_log = logger;
// Setup event and statistics callbacks
opts->listeners.emplace_back(this->events);
@ -1857,22 +1857,22 @@ noexcept
///////////////////////////////////////////////////////////////////////////////
//
// database::logs
// database::logger
//
ircd::db::database::logs::logs(database *const &d)
ircd::db::database::logger::logger(database *const &d)
:rocksdb::Logger{}
,d{d}
{
}
ircd::db::database::logs::~logs()
ircd::db::database::logger::~logger()
noexcept
{
}
rocksdb::Status
ircd::db::database::logs::Close()
ircd::db::database::logger::Close()
noexcept
{
return rocksdb::Status::NotSupported();
@ -1898,16 +1898,16 @@ translate(const rocksdb::InfoLogLevel &level)
}
void
ircd::db::database::logs::Logv(const char *const fmt,
va_list ap)
ircd::db::database::logger::Logv(const char *const fmt,
va_list ap)
noexcept
{
Logv(rocksdb::InfoLogLevel::DEBUG_LEVEL, fmt, ap);
}
void
ircd::db::database::logs::LogHeader(const char *const fmt,
va_list ap)
ircd::db::database::logger::LogHeader(const char *const fmt,
va_list ap)
noexcept
{
Logv(rocksdb::InfoLogLevel::DEBUG_LEVEL, fmt, ap);
@ -1916,9 +1916,9 @@ noexcept
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wsuggest-attribute=format"
void
ircd::db::database::logs::Logv(const rocksdb::InfoLogLevel level,
const char *const fmt,
va_list ap)
ircd::db::database::logger::Logv(const rocksdb::InfoLogLevel level,
const char *const fmt,
va_list ap)
noexcept
{
if(level < GetInfoLogLevel())