Skip to content

Commit 5223e5e

Browse files
committed
refactor: refactoring logger
1 parent 7c255b5 commit 5223e5e

File tree

2 files changed

+9
-28
lines changed

2 files changed

+9
-28
lines changed

src/legacy/api/LoggerAPI.cpp

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -52,25 +52,7 @@ string& StrReplace(string& str, const string& to_replaced, const string& new_str
5252
void inline LogDataHelper(LogLevel level, const Arguments& args) {
5353
std::string res;
5454
for (int i = 0; i < args.size(); ++i) res += ValueToString(args[i]);
55-
switch (level) {
56-
case LogLevel::Fatal:
57-
ENGINE_OWN_DATA()->getModInstance()->getLogger().fatal(res);
58-
break;
59-
case LogLevel::Error:
60-
ENGINE_OWN_DATA()->getModInstance()->getLogger().error(res);
61-
break;
62-
case LogLevel::Warn:
63-
ENGINE_OWN_DATA()->getModInstance()->getLogger().warn(res);
64-
break;
65-
case LogLevel::Info:
66-
ENGINE_OWN_DATA()->getModInstance()->getLogger().info(res);
67-
break;
68-
case LogLevel::Debug:
69-
ENGINE_OWN_DATA()->getModInstance()->getLogger().debug(res);
70-
break;
71-
default:
72-
break;
73-
}
55+
ENGINE_OWN_DATA()->getModInstance()->getLogger().log(level, res);
7456
}
7557

7658
Local<Value> LoggerClass::log(const Arguments& args) {
@@ -206,7 +188,7 @@ Local<Value> LoggerClass::setLogLevel(const Arguments& args) {
206188

207189
try {
208190
auto conf = ENGINE_OWN_DATA();
209-
conf->getModInstance()->getLogger().setFlushLevel(static_cast<LogLevel>(args[0].toInt() + 1));
191+
conf->getModInstance()->getLogger().setLevel(static_cast<LogLevel>(args[0].toInt() + 1));
210192
return Boolean::newBoolean(true);
211193
}
212194
CATCH("Fail in SetLogLevel!")

src/lse/api/PlayerSink.cpp

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22

33
#include "ll/api/io/FileUtils.h"
44
#include "ll/api/io/PatternFormatter.h"
5-
#include "mc/world/actor/player/Player.h"
65
#include "ll/api/service/Bedrock.h"
6+
#include "mc/world/actor/player/Player.h"
77
#include "mc/world/level/Level.h"
88

99
namespace lse::io {
1010

1111
PlayerSink::PlayerSink(mce::UUID const& uuid)
12-
: Sink(ll::makePolymorphic<ll::io::PatternFormatter>("{3:.3%T.} {2} {1} {0}", ll::io::Formatter::supportColorLog(), 0b0010)),
12+
: Sink(ll::makePolymorphic<ll::io::PatternFormatter>("<{tit}|{lvl}> [{tm:%T}] {msg}", false)),
1313
playerUuid(uuid) {}
1414

1515
PlayerSink::~PlayerSink() = default;
@@ -22,11 +22,10 @@ void PlayerSink::append(ll::io::LogMessageView const& view) {
2222
std::lock_guard lock(mutex);
2323
std::string buffer;
2424
formatter->format(view, buffer);
25-
ll::service::getLevel()->getPlayer(playerUuid)->sendMessage(buffer);
26-
buffer.clear();
25+
if (auto* player = ll::service::getLevel()->getPlayer(playerUuid)) {
26+
player->sendMessage(buffer);
27+
}
2728
}
2829

29-
void PlayerSink::setUUID(mce::UUID const& uuid) {
30-
playerUuid = uuid;
31-
}
32-
} // namespace ll::io
30+
void PlayerSink::setUUID(mce::UUID const& uuid) { playerUuid = uuid; }
31+
} // namespace lse::io

0 commit comments

Comments
 (0)