Skip to content

Commit 033329e

Browse files
committed
refactor: use spdlog provided in common lib
1 parent e398bf9 commit 033329e

7 files changed

Lines changed: 4 additions & 133 deletions

File tree

app/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ target_include_directories(modian_brush PUBLIC
1111
target_link_libraries(modian_brush
1212
PRIVATE
1313
modian::common::core::logger
14+
modian::common::infra::logger
1415
modian::brush::tsf
15-
modian::brush::logger
1616
ole32
1717
delayimp
1818
runtimeobject.lib

app/server.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#include <new>
22

3-
#include "modian/logger/spdlog_logger.h"
3+
#include "modian/common/infra/logger/spdlog_logger.h"
44
#include "modian/common/core/logger/logger_service.h"
55
#include "modian/tsf/dll/info/registry_info.h"
66
#include "modian/tsf/class_factory.h"
@@ -15,7 +15,7 @@ STDAPI DllCanUnloadNow() {
1515

1616
STDAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void** ppv) {
1717
modian::common::core::logger_service::update_logger([](){
18-
return std::make_shared<modian::brush::infra::logger::spdlog_logger>();
18+
return std::make_shared<modian::common::infra::logger::spdlog_logger>("brush");
1919
});
2020

2121
modian::common::core::logger_service::logger()->info("Getting class object...");
@@ -58,7 +58,7 @@ STDAPI DllUnregisterServer() {
5858

5959
STDAPI DllRegisterServer() {
6060
modian::common::core::logger_service::update_logger([](){
61-
return std::make_shared<modian::brush::infra::logger::spdlog_logger>();
61+
return std::make_shared<modian::common::infra::logger::spdlog_logger>("brush");
6262
});
6363

6464
modian::common::core::logger_service::print_logo();

infra/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
1-
add_subdirectory(logger)
21
add_subdirectory(tsf)
32
add_subdirectory(ipc)

infra/logger/CMakeLists.txt

Lines changed: 0 additions & 26 deletions
This file was deleted.

infra/logger/include/modian/logger/spdlog_logger.h

Lines changed: 0 additions & 20 deletions
This file was deleted.

infra/logger/src/spdlog_logger.cpp

Lines changed: 0 additions & 81 deletions
This file was deleted.

infra/tsf/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ target_include_directories(modian_brush_tsf PUBLIC
2929
target_link_libraries(modian_brush_tsf PRIVATE
3030
modian::common::core::logger
3131
modian::common::service::protocol
32-
modian::brush::logger
3332
modian::brush::ipc
3433
)
3534

0 commit comments

Comments
 (0)