@@ -191,16 +191,12 @@ template <typename Function>
191
191
struct signature ;
192
192
193
193
class logger {
194
- std::function<void (const sstring&)> _logger;
195
194
::seastar::logger* _seastar_logger = nullptr ;
196
195
197
- // _seastar_logger will always be used first if it's available
198
196
void log (const sstring& str) const {
199
197
if (_seastar_logger) {
200
198
// default level for log messages is `info`
201
199
_seastar_logger->info (" {}" , str);
202
- } else if (_logger) {
203
- _logger (str);
204
200
}
205
201
}
206
202
@@ -213,25 +209,10 @@ class logger {
213
209
#endif
214
210
if (_seastar_logger) {
215
211
_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 ()});
227
212
}
228
213
}
229
214
230
215
public:
231
- void set (std::function<void (const sstring&)> l) {
232
- _logger = std::move (l);
233
- }
234
-
235
216
void set (::seastar::logger* logger) {
236
217
_seastar_logger = logger;
237
218
}
@@ -924,14 +905,6 @@ public:
924
905
// / handlers finished.
925
906
future<> unregister_handler (MsgType t);
926
907
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
- }
935
908
936
909
// / Set a logger to be used to log messages.
937
910
void set_logger (::seastar::logger* logger) {
0 commit comments