From 686fc754b2878f407d3da432de9369c9cb183f7b Mon Sep 17 00:00:00 2001 From: "vladimir.kuznetsov" Date: Wed, 28 Dec 2022 17:22:49 +0300 Subject: [PATCH] renamed log class in service project to logger --- client/logger.cpp | 2 +- ipc/ipcserver.cpp | 10 +++++----- service/server/CMakeLists.txt | 8 ++++---- service/server/{log.cpp => logger.cpp} | 21 +++++++++++---------- service/server/{log.h => logger.h} | 8 ++++---- service/server/main.cpp | 4 ++-- service/server/server.pro | 4 ++-- 7 files changed, 29 insertions(+), 28 deletions(-) rename service/server/{log.cpp => logger.cpp} (83%) rename service/server/{log.h => logger.h} (87%) diff --git a/client/logger.cpp b/client/logger.cpp index 9b217218..d734e2d8 100644 --- a/client/logger.cpp +++ b/client/logger.cpp @@ -83,7 +83,7 @@ bool Logger::init() void Logger::deInit() { - qInstallMessageHandler(0); + qInstallMessageHandler(nullptr); qSetMessagePattern("%{message}"); m_textStream.setDevice(nullptr); m_file.close(); diff --git a/ipc/ipcserver.cpp b/ipc/ipcserver.cpp index d71d7c7d..3d248b84 100644 --- a/ipc/ipcserver.cpp +++ b/ipc/ipcserver.cpp @@ -5,7 +5,7 @@ #include #include "router.h" -#include "log.h" +#include "logger.h" #ifdef Q_OS_WIN #include "tapcontroller_win.h" @@ -111,16 +111,16 @@ QStringList IpcServer::getTapList() void IpcServer::cleanUp() { qDebug() << "IpcServer::cleanUp"; - Log::deinit(); - Log::cleanUp(); + Logger::deinit(); + Logger::cleanUp(); } void IpcServer::setLogsEnabled(bool enabled) { if (enabled) { - Log::init(); + Logger::init(); } else { - Log::deinit(); + Logger::deinit(); } } diff --git a/service/server/CMakeLists.txt b/service/server/CMakeLists.txt index 31ee3372..23df6424 100644 --- a/service/server/CMakeLists.txt +++ b/service/server/CMakeLists.txt @@ -15,7 +15,7 @@ set(HEADERS ${CMAKE_CURRENT_LIST_DIR}/../../ipc/ipcserver.h ${CMAKE_CURRENT_LIST_DIR}/../../ipc/ipcserverprocess.h ${CMAKE_CURRENT_LIST_DIR}/localserver.h - ${CMAKE_CURRENT_LIST_DIR}/log.h + ${CMAKE_CURRENT_LIST_DIR}/logger.h ${CMAKE_CURRENT_LIST_DIR}/router.h ${CMAKE_CURRENT_LIST_DIR}/systemservice.h ) @@ -25,7 +25,7 @@ set(SOURCES ${CMAKE_CURRENT_LIST_DIR}/../../ipc/ipcserver.cpp ${CMAKE_CURRENT_LIST_DIR}/../../ipc/ipcserverprocess.cpp ${CMAKE_CURRENT_LIST_DIR}/localserver.cpp - ${CMAKE_CURRENT_LIST_DIR}/log.cpp + ${CMAKE_CURRENT_LIST_DIR}/logger.cpp ${CMAKE_CURRENT_LIST_DIR}/main.cpp ${CMAKE_CURRENT_LIST_DIR}/router.cpp ${CMAKE_CURRENT_LIST_DIR}/systemservice.cpp @@ -82,9 +82,9 @@ endif() include(${CMAKE_CURRENT_LIST_DIR}/../src/qtservice.cmake) include_directories( + ${CMAKE_CURRENT_LIST_DIR} ${CMAKE_CURRENT_LIST_DIR}/../../client ${CMAKE_CURRENT_LIST_DIR}/../../ipc - ${CMAKE_CURRENT_LIST_DIR} ${CMAKE_CURRENT_BINARY_DIR} ) @@ -107,4 +107,4 @@ add_custom_command( ${CMAKE_SOURCE_DIR}/deploy/data/${DEPLOY_ARTIFACT_PATH} $ COMMAND_EXPAND_LISTS -) \ No newline at end of file +) diff --git a/service/server/log.cpp b/service/server/logger.cpp similarity index 83% rename from service/server/log.cpp rename to service/server/logger.cpp index a5d56ae5..8b44e0c6 100644 --- a/service/server/log.cpp +++ b/service/server/logger.cpp @@ -1,15 +1,16 @@ +#include "logger.h" + #include #include #include -#include "log.h" #include "defines.h" #include "utilities.h" -QFile Log::m_file; -QTextStream Log::m_textStream; -QString Log::m_logFileName = QString("%1.log").arg(SERVICE_NAME); +QFile Logger::m_file; +QTextStream Logger::m_textStream; +QString Logger::m_logFileName = QString("%1.log").arg(SERVICE_NAME); void debugMessageHandler(QtMsgType type, const QMessageLogContext& context, const QString& msg) { @@ -17,12 +18,12 @@ void debugMessageHandler(QtMsgType type, const QMessageLogContext& context, cons return; } - Log::m_textStream << qFormatLogMessage(type, context, msg) << Qt::endl << Qt::flush; + Logger::m_textStream << qFormatLogMessage(type, context, msg) << Qt::endl << Qt::flush; std::cout << qFormatLogMessage(type, context, msg).toStdString() << std::endl << std::flush; } -bool Log::init() +bool Logger::init() { if (m_file.isOpen()) return true; @@ -46,19 +47,19 @@ bool Log::init() return true; } -void Log::deinit() +void Logger::deinit() { m_file.close(); m_textStream.setDevice(nullptr); qInstallMessageHandler(nullptr); } -QString Log::serviceLogFileNamePath() +QString Logger::serviceLogFileNamePath() { return m_file.fileName(); } -void Log::clearLogs() +void Logger::clearLogs() { bool isLogActive = m_file.isOpen(); m_file.close(); @@ -78,7 +79,7 @@ void Log::clearLogs() } } -void Log::cleanUp() +void Logger::cleanUp() { clearLogs(); deinit(); diff --git a/service/server/log.h b/service/server/logger.h similarity index 87% rename from service/server/log.h rename to service/server/logger.h index e87dda1d..59044470 100644 --- a/service/server/log.h +++ b/service/server/logger.h @@ -1,12 +1,12 @@ -#ifndef LOG_H -#define LOG_H +#ifndef LOGGER_H +#define LOGGER_H #include #include #include #include -class Log +class Logger { public: static bool init(); @@ -25,4 +25,4 @@ private: static QTextStream m_textStream; }; -#endif // LOG_H +#endif // LOGGER_H diff --git a/service/server/main.cpp b/service/server/main.cpp index 6908a9d8..fe566652 100644 --- a/service/server/main.cpp +++ b/service/server/main.cpp @@ -2,7 +2,7 @@ #include "defines.h" #include "localserver.h" -#include "log.h" +#include "logger.h" #include "systemservice.h" #include "utilities.h" @@ -20,7 +20,7 @@ int main(int argc, char **argv) { Utils::initializePath(Utils::systemLogPath()); - Log::init(); + Logger::init(); if (argc == 2) { qInfo() << "Started as console application"; diff --git a/service/server/server.pro b/service/server/server.pro index 0d3ecd2a..ca7d85cb 100644 --- a/service/server/server.pro +++ b/service/server/server.pro @@ -10,7 +10,7 @@ HEADERS = \ ../../ipc/ipcserver.h \ ../../ipc/ipcserverprocess.h \ localserver.h \ - log.h \ + logger.h \ router.h \ systemservice.h @@ -19,7 +19,7 @@ SOURCES = \ ../../ipc/ipcserver.cpp \ ../../ipc/ipcserverprocess.cpp \ localserver.cpp \ - log.cpp \ + logger.cpp \ main.cpp \ router.cpp \ systemservice.cpp