Skip to content

Commit 3030366

Browse files
committed
rpc: remove deprecated logging function support
rpc switched to logging via a seastar::logger 5 years ago, so remove the deprecated older method.
1 parent e788bd6 commit 3030366

File tree

2 files changed

+0
-36
lines changed

2 files changed

+0
-36
lines changed

include/seastar/rpc/rpc.hh

-27
Original file line numberDiff line numberDiff line change
@@ -191,16 +191,12 @@ template <typename Function>
191191
struct signature;
192192

193193
class logger {
194-
std::function<void(const sstring&)> _logger;
195194
::seastar::logger* _seastar_logger = nullptr;
196195

197-
// _seastar_logger will always be used first if it's available
198196
void log(const sstring& str) const {
199197
if (_seastar_logger) {
200198
// default level for log messages is `info`
201199
_seastar_logger->info("{}", str);
202-
} else if (_logger) {
203-
_logger(str);
204200
}
205201
}
206202

@@ -213,25 +209,10 @@ class logger {
213209
#endif
214210
if (_seastar_logger) {
215211
_seastar_logger->log(level, fmt, std::forward<Args>(args)...);
216-
// If the log level is at least `info`, fall back to legacy logging without explicit level.
217-
// Ignore less severe levels in order not to spam user's log with messages during transition,
218-
// i.e. when the user still only defines a level-less logger.
219-
} else if (_logger && level <= log_level::info) {
220-
fmt::memory_buffer out;
221-
#ifdef SEASTAR_LOGGER_COMPILE_TIME_FMT
222-
fmt::format_to(fmt::appender(out), fmt, std::forward<Args>(args)...);
223-
#else
224-
fmt::format_to(fmt::appender(out), fmt::runtime(fmt), std::forward<Args>(args)...);
225-
#endif
226-
_logger(sstring{out.data(), out.size()});
227212
}
228213
}
229214

230215
public:
231-
void set(std::function<void(const sstring&)> l) {
232-
_logger = std::move(l);
233-
}
234-
235216
void set(::seastar::logger* logger) {
236217
_seastar_logger = logger;
237218
}
@@ -924,14 +905,6 @@ public:
924905
/// handlers finished.
925906
future<> unregister_handler(MsgType t);
926907

927-
/// Set a logger function to be used to log messages.
928-
///
929-
/// \deprecated use the logger overload set_logger(::seastar::logger*)
930-
/// instead.
931-
[[deprecated("Use set_logger(::seastar::logger*) instead")]]
932-
void set_logger(std::function<void(const sstring&)> logger) {
933-
_logger.set(std::move(logger));
934-
}
935908

936909
/// Set a logger to be used to log messages.
937910
void set_logger(::seastar::logger* logger) {

tests/unit/rpc_test.cc

-9
Original file line numberDiff line numberDiff line change
@@ -1542,15 +1542,6 @@ SEASTAR_TEST_CASE(test_loggers) {
15421542
proto.set_logger(&log);
15431543
logger(dummy_addr, "Hello2");
15441544
logger(dummy_addr, log_level::debug, "Hello3");
1545-
// We *want* to test the deprecated API, don't spam warnings about it.
1546-
#pragma GCC diagnostic push
1547-
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
1548-
proto.set_logger([] (const sstring& str) {
1549-
log.info("Test: {}", str);
1550-
});
1551-
#pragma GCC diagnostic pop
1552-
logger(dummy_addr, "Hello4");
1553-
logger(dummy_addr, log_level::debug, "Hello5");
15541545
proto.set_logger(nullptr);
15551546
logger(dummy_addr, "Hello6");
15561547
logger(dummy_addr, log_level::debug, "Hello7");

0 commit comments

Comments
 (0)