diff --git a/log_analysis/server/src/details/controller_wrapper.h b/log_analysis/server/src/details/controller_wrapper.h index 098bbca..d7ef2cd 100644 --- a/log_analysis/server/src/details/controller_wrapper.h +++ b/log_analysis/server/src/details/controller_wrapper.h @@ -8,18 +8,25 @@ #include "traits.h" namespace server::details { + /// @brief Обёртка-компонент над контроллером + /// @tparam Controller Тип контроллера template class ControllerWrapper final : public userver::server::handlers::HttpHandlerBase { public: + /// @brief Название компонента static constexpr std::string_view kName = server::details::traits::ControllerTraits::name; using HttpHandlerBase::HttpHandlerBase; + /// @brief Обработка запроса + /// @param[in] request Запрос + /// @param[in] context Контекст + /// @returns Ответ std::string HandleRequestThrow(const userver::server::http::HttpRequest& request, userver::server::request::RequestContext&) const override { return server::details::HandleRequest(controller_, request.RequestBody()); } private: - Controller controller_; + Controller controller_; ///< Контроллер }; } diff --git a/log_analysis/server/src/details/fields.h b/log_analysis/server/src/details/fields.h index b57f7a1..0b217ff 100644 --- a/log_analysis/server/src/details/fields.h +++ b/log_analysis/server/src/details/fields.h @@ -2,7 +2,7 @@ #include -/// @brief Поля запроса +/// @brief Поля запроса и ответа namespace server::details::fields { constexpr std::string_view parameters = "parameters"; ///< Параметры constexpr std::string_view status = "status"; ///< Статус ответа (ok/error) diff --git a/log_analysis/server/src/main.cpp b/log_analysis/server/src/main.cpp index 11bb744..b51ce3c 100644 --- a/log_analysis/server/src/main.cpp +++ b/log_analysis/server/src/main.cpp @@ -10,49 +10,34 @@ #include #include -#include -#include +#include #include "details/controller_wrapper.h" #include "details/storage_wrapper.h" -#include "details/details.h" void Log(LogLevel level, const char* message) { std::cout << message << std::endl; } int main(int argc, char** argv) { - if (argc < 2) { - std::cout << "usage: " << argv[0] << " " << std::endl; - return -1; - } + // Настраиваем логирование + Logger::Get().SetSettings(LogLevel::Info, Log); - try { - // Парсим конфигурационный файл - auto configuration = ParseConfiguration(argv[1]); + // Создаём список компонентов + const auto component_list = userver::components::MinimalServerComponentList() + // Static content + .Append("fs-cache-main") + .Append() + // Storage + .Append() + // Anomaly Logs + .Append>() + // Logs Clusters + .Append>() + .Append>() + // Statistics + .Append>(); - // Настраиваем логирование - Logger::Get().SetSettings(LogLevel::Info, Log); - - // Подключаемся к базе данных - ConnectToStorage(configuration); - const auto component_list = userver::components::MinimalServerComponentList() - // static content - .Append("fs-cache-main") - .Append() - // storage - .Append() - // anomaly logs - .Append>() - // clusters - .Append>() - .Append>() - // statistics - .Append>(); - - return userver::utils::DaemonMain(argc, argv, component_list); - } catch (const std::exception& e) { - std::cout << e.what() << std::endl; - return -1; - } + // Запускаем сервер + return userver::utils::DaemonMain(argc, argv, component_list); } diff --git a/log_analysis/storage/include/storage/storage.h b/log_analysis/storage/include/storage/storage.h index c2e4653..e26326a 100644 --- a/log_analysis/storage/include/storage/storage.h +++ b/log_analysis/storage/include/storage/storage.h @@ -13,15 +13,20 @@ namespace storage { std::string database, username, password, host, port; }; + /// @brief Хранилище class Storage { public: + /// @brief Получение хранилища + /// @returns Хранилище static Storage& Get(); + /// @brief Подключение к хранилищу + /// @param[in] connection_data Данных подключения static void Connect(const ConnectionData& connection_data); friend class Transaction; private: - std::unique_ptr connection_; + std::unique_ptr connection_; ///< Соединение }; } diff --git a/log_analysis/storage/include/storage/transaction.h b/log_analysis/storage/include/storage/transaction.h index 0ed5434..1ad3e91 100644 --- a/log_analysis/storage/include/storage/transaction.h +++ b/log_analysis/storage/include/storage/transaction.h @@ -5,21 +5,33 @@ #include namespace storage { + /// @brief Транзакция class Transaction { public: + /// @brief Деструктор ~Transaction(); + /// @brief Конструктор перемещения Transaction(Transaction&&) = default; + + /// @brief Оператор перемещающего присваивания Transaction& operator=(Transaction&&) = default; + /// @brief Создание транзацкии + /// @pre Должно быть установлено соединение с хранилищем + /// @returns Транзакция static Transaction Create(); + /// @brief Выполнение запроса + /// @param[in] query Запрос + /// @returns Результат выполнения pqxx::result Do(std::string_view query) const; private: + /// @brief Конструктор Transaction() = default; private: - std::unique_ptr transaction_; + std::unique_ptr transaction_; ///< Транзакция }; } diff --git a/log_analysis/server/include/server/logger.h b/log_analysis/utils/include/utils/logger.h similarity index 91% rename from log_analysis/server/include/server/logger.h rename to log_analysis/utils/include/utils/logger.h index d6e9271..df67030 100644 --- a/log_analysis/server/include/server/logger.h +++ b/log_analysis/utils/include/utils/logger.h @@ -2,6 +2,7 @@ #include +/// @brief Уровень логирования enum class LogLevel { Debug, Access, @@ -14,6 +15,7 @@ enum class LogLevel { /// @brief Функция логирования using LogFunction = void (*)(LogLevel, const char*); +/// @brief Логгер class Logger { public: /// @brief Получение экземпляра класса Logger diff --git a/log_analysis/utils/include/utils/utils.h b/log_analysis/utils/include/utils/utils.h index 85cd3b4..d653e30 100644 --- a/log_analysis/utils/include/utils/utils.h +++ b/log_analysis/utils/include/utils/utils.h @@ -1,3 +1,5 @@ +#pragma once + #include #include diff --git a/log_analysis/server/src/logger.cpp b/log_analysis/utils/src/logger.cpp similarity index 90% rename from log_analysis/server/src/logger.cpp rename to log_analysis/utils/src/logger.cpp index 89aac9a..64c156f 100644 --- a/log_analysis/server/src/logger.cpp +++ b/log_analysis/utils/src/logger.cpp @@ -1,4 +1,4 @@ -#include +#include > Logger& Logger::Get() { static Logger logger;