Skip to content

Commit 200499d

Browse files
committed
Fix logger
1 parent b03686d commit 200499d

File tree

4 files changed

+3
-10
lines changed

4 files changed

+3
-10
lines changed

ClientSource/Connection/MessageLogger.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -96,11 +96,6 @@ void SerialLogger::log(const std::string& msg, Color color){
9696
m_logger.log(msg, color);
9797
}
9898
}
99-
void SerialLogger::log(std::string msg){
100-
if (ok_to_log()){
101-
m_logger.log(msg, COLOR_DARKGREEN);
102-
}
103-
}
10499

105100
bool SerialLogger::ok_to_log(){
106101
WallClock now = current_time();

ClientSource/Connection/MessageLogger.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,12 @@ class MessageLogger : public MessageSniffer{
4040

4141

4242

43-
class SerialLogger : public Logger, public MessageLogger{
43+
class SerialLogger : public MessageLogger{
4444
public:
4545
SerialLogger(Logger& logger, bool log_everything);
4646

4747
virtual void log(const char* msg, Color color = Color()) override;
4848
virtual void log(const std::string& msg, Color color = Color()) override;
49-
virtual void log(std::string msg) override;
5049

5150
private:
5251
bool ok_to_log();

ClientSource/Connection/MessageSniffer.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,8 @@ namespace PokemonAutomation{
1515
struct BotBaseMessage;
1616

1717

18-
class MessageSniffer{
18+
class MessageSniffer : public Logger{
1919
public:
20-
virtual void log(std::string msg){}
2120
virtual void on_send(const BotBaseMessage& message, bool is_retransmit){}
2221
virtual void on_recv(const BotBaseMessage& message){}
2322
};

Common/Cpp/AbstractLogger.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ namespace PokemonAutomation{
1616

1717
class Logger{
1818
public:
19-
virtual void log(const std::string& msg, Color color = Color()) = 0;
19+
virtual void log([[maybe_unused]] const std::string& msg, [[maybe_unused]] Color color = Color()){};
2020
virtual void log(std::string&& msg, Color color = Color()){
2121
log((const std::string&)msg, color);
2222
}

0 commit comments

Comments
 (0)