thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-21 23:21:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

More specific log messages for each access storage type

Browse Source
This commit is contained in:
Denis Glazachev 2020-10-22 20:47:52 +04:00
parent f351b52851
commit a6439aba44
4 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/Access/AccessControlManager.cpp
View File

@ -137,12 +137,6 @@ AccessControlManager::AccessControlManager()
AccessControlManager::~AccessControlManager() = default; AccessControlManager::~AccessControlManager() = default;
void AccessControlManager::addStorage(const StoragePtr & new_storage)
{
MultipleAccessStorage::addStorage(new_storage);
LOG_DEBUG(getLogger(), "Added storage '{}' of type '{}'", new_storage->getStorageName(), String(new_storage->getStorageType()));
}
void AccessControlManager::setUsersConfig(const Poco::Util::AbstractConfiguration & users_config_) void AccessControlManager::setUsersConfig(const Poco::Util::AbstractConfiguration & users_config_)
{ {
auto storages = getStoragesPtr(); auto storages = getStoragesPtr();
@ -168,6 +162,7 @@ void AccessControlManager::addUsersConfigStorage(const String & storage_name_, c
auto new_storage = std::make_shared<UsersConfigAccessStorage>(storage_name_, check_setting_name_function); auto new_storage = std::make_shared<UsersConfigAccessStorage>(storage_name_, check_setting_name_function);
new_storage->setConfig(users_config_); new_storage->setConfig(users_config_);
addStorage(new_storage); addStorage(new_storage);
LOG_DEBUG(getLogger(), "Added {} access storage '{}', path: {}", String(new_storage->getStorageType()), new_storage->getStorageName(), new_storage->getPath());
} }
void AccessControlManager::addUsersConfigStorage( void AccessControlManager::addUsersConfigStorage(
@ -200,6 +195,7 @@ void AccessControlManager::addUsersConfigStorage(
auto new_storage = std::make_shared<UsersConfigAccessStorage>(storage_name_, check_setting_name_function); auto new_storage = std::make_shared<UsersConfigAccessStorage>(storage_name_, check_setting_name_function);
new_storage->load(users_config_path_, include_from_path_, preprocessed_dir_, get_zookeeper_function_); new_storage->load(users_config_path_, include_from_path_, preprocessed_dir_, get_zookeeper_function_);
addStorage(new_storage); addStorage(new_storage);
LOG_DEBUG(getLogger(), "Added {} access storage '{}', path: {}", String(new_storage->getStorageType()), new_storage->getStorageName(), new_storage->getPath());
} }
void AccessControlManager::reloadUsersConfigs() void AccessControlManager::reloadUsersConfigs()
@ -243,7 +239,9 @@ void AccessControlManager::addDiskStorage(const String & storage_name_, const St
} }
} }
} }
addStorage(std::make_shared<DiskAccessStorage>(storage_name_, directory_, readonly_)); auto new_storage = std::make_shared<DiskAccessStorage>(storage_name_, directory_, readonly_);
addStorage(new_storage);
LOG_DEBUG(getLogger(), "Added {} access storage '{}', path: {}", String(new_storage->getStorageType()), new_storage->getStorageName(), new_storage->getPath());
} }
@ -255,13 +253,17 @@ void AccessControlManager::addMemoryStorage(const String & storage_name_)
if (auto memory_storage = typeid_cast<std::shared_ptr<MemoryAccessStorage>>(storage)) if (auto memory_storage = typeid_cast<std::shared_ptr<MemoryAccessStorage>>(storage))
return; return;
} }
addStorage(std::make_shared<MemoryAccessStorage>(storage_name_)); auto new_storage= std::make_shared<MemoryAccessStorage>(storage_name_);
addStorage(new_storage);
LOG_DEBUG(getLogger(), "Added {} access storage '{}'", String(new_storage->getStorageType()), new_storage->getStorageName());
} }
void AccessControlManager::addLDAPStorage(const String & storage_name_, const Poco::Util::AbstractConfiguration & config_, const String & prefix_) void AccessControlManager::addLDAPStorage(const String & storage_name_, const Poco::Util::AbstractConfiguration & config_, const String & prefix_)
{ {
addStorage(std::make_shared<LDAPAccessStorage>(storage_name_, this, config_, prefix_)); auto new_storage = std::make_shared<LDAPAccessStorage>(storage_name_, this, config_, prefix_);
addStorage(new_storage);
LOG_DEBUG(getLogger(), "Added {} access storage '{}', LDAP server name: {}", String(new_storage->getStorageType()), new_storage->getStorageName(), new_storage->getLDAPServerName());
} }

2
src/Access/AccessControlManager.h
View File

@ -149,8 +149,6 @@ public:
const ExternalAuthenticators & getExternalAuthenticators() const; const ExternalAuthenticators & getExternalAuthenticators() const;
private: private:
void addStorage(const StoragePtr & new_storage);
class ContextAccessCache; class ContextAccessCache;
class CustomSettingsPrefixes; class CustomSettingsPrefixes;

6
src/Access/LDAPAccessStorage.cpp
View File

@ -29,6 +29,12 @@ LDAPAccessStorage::LDAPAccessStorage(const String & storage_name_, AccessControl
} }
String LDAPAccessStorage::getLDAPServerName() const
{
return ldap_server;
}
void LDAPAccessStorage::setConfiguration(AccessControlManager * access_control_manager_, const Poco::Util::AbstractConfiguration & config, const String & prefix) void LDAPAccessStorage::setConfiguration(AccessControlManager * access_control_manager_, const Poco::Util::AbstractConfiguration & config, const String & prefix)
{ {
std::scoped_lock lock(mutex); std::scoped_lock lock(mutex);

2
src/Access/LDAPAccessStorage.h
View File

@ -32,6 +32,8 @@ public:
explicit LDAPAccessStorage(const String & storage_name_, AccessControlManager * access_control_manager_, const Poco::Util::AbstractConfiguration & config, const String & prefix); explicit LDAPAccessStorage(const String & storage_name_, AccessControlManager * access_control_manager_, const Poco::Util::AbstractConfiguration & config, const String & prefix);
virtual ~LDAPAccessStorage() override = default; virtual ~LDAPAccessStorage() override = default;
String getLDAPServerName() const;
public: // IAccessStorage implementations. public: // IAccessStorage implementations.
virtual const char * getStorageType() const override; virtual const char * getStorageType() const override;
virtual String getStorageParamsJSON() const override; virtual String getStorageParamsJSON() const override;