Commit e970a396 authored by captainwong's avatar captainwong

update

parent ece8f1a6
...@@ -28,12 +28,19 @@ ...@@ -28,12 +28,19 @@
namespace jlib namespace jlib
{ {
#define JLOG_ORIGIN
#define JLOG jlib::log::log_utf16 #define JLOG jlib::log::log_utf16
#define JLOGA jlib::log::log_utf8 #define JLOGA jlib::log::log_utf8
#define JLOGW jlib::log::log_utf16 #define JLOGW jlib::log::log_utf16
#define JLOGB(b, l) jlib::log::dump_hex(b, l) #define JLOGB(b, l) jlib::log::dump_hex(b, l)
#define JLOGASC(b, l) jlib::log::dump_ascii(b, l) #define JLOGASC(b, l) jlib::log::dump_ascii(b, l)
#define JLOG_ERRO JLOGA
#define JLOG_INFO JLOGA
#define JLOG_HEX JLOGB
#define JLOG_ASC JLOGASC
#ifdef __GNUG__ #ifdef __GNUG__
inline int _vsnwprintf_s(wchar_t* __restrict__ __s, size_t n, size_t, const wchar_t* __restrict__ __format, __gnuc_va_list __arg) { inline int _vsnwprintf_s(wchar_t* __restrict__ __s, size_t n, size_t, const wchar_t* __restrict__ __format, __gnuc_va_list __arg) {
return std::vswprintf(__s, n, __format, __arg); return std::vswprintf(__s, n, __format, __arg);
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
#include "spdlog/spdlog.h" #include "spdlog/spdlog.h"
#ifdef WIN32 #ifdef WIN32
#include "spdlog/sinks/msvc_sink.h" #include "spdlog/sinks/msvc_sink.h"
#include "win32.h"
#ifndef _CRT_SECURE_NO_WARNINGS #ifndef _CRT_SECURE_NO_WARNINGS
#define _CRT_SECURE_NO_WARNINGS #define _CRT_SECURE_NO_WARNINGS
#endif #endif
...@@ -23,7 +24,7 @@ inline void init_logger(const std::string& file_name = "") ...@@ -23,7 +24,7 @@ inline void init_logger(const std::string& file_name = "")
sinks.push_back(std::make_shared<spdlog::sinks::stdout_sink_mt>()); sinks.push_back(std::make_shared<spdlog::sinks::stdout_sink_mt>());
sinks.push_back(std::make_shared<spdlog::sinks::daily_file_sink_mt>( sinks.push_back(std::make_shared<spdlog::sinks::daily_file_sink_mt>(
#ifdef WIN32 #ifdef WIN32
utf8::a2w(file_name + ".log") utf8::mbcs_to_u16(file_name + ".log")
#else #else
file_name + ".log" file_name + ".log"
#endif #endif
...@@ -32,7 +33,13 @@ inline void init_logger(const std::string& file_name = "") ...@@ -32,7 +33,13 @@ inline void init_logger(const std::string& file_name = "")
combined_logger->set_pattern("[%Y-%m-%d %H:%M:%S.%e] [tid %t] [%L] %v"); combined_logger->set_pattern("[%Y-%m-%d %H:%M:%S.%e] [tid %t] [%L] %v");
spdlog::register_logger(combined_logger); spdlog::register_logger(combined_logger);
} catch (const spdlog::spdlog_ex& ex) { } catch (const spdlog::spdlog_ex& ex) {
#ifdef WIN32
char msg[1024] = { 0 };
sprintf_s(msg, "Log initialization failed: %s\n", ex.what());
OutputDebugStringA(msg);
#else
std::cerr << "Log initialization failed: " << ex.what() << std::endl; std::cerr << "Log initialization failed: " << ex.what() << std::endl;
#endif
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment