Skip to content

Commit 2fcc163

Browse files
committed
logger fixes
1 parent c23e1ff commit 2fcc163

1 file changed

Lines changed: 12 additions & 8 deletions

File tree

src/common/capio/logger.hpp

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -356,19 +356,23 @@ class Logger {
356356
#else
357357

358358
#ifdef __CAPIO_POSIX
359-
#define ERR_EXIT(message, ...) \
359+
#define ERR_EXIT(fmt, ...) \
360360
if (!continue_on_error) { \
361361
syscall_no_intercept_flag = true; \
362-
std::cout << CAPIO_LOG_SERVER_CLI_LEVEL_ERROR << " [ libcapio_posix.so ] " << message \
363-
<< std::endl; \
364-
exit(EXIT_FAILURE); \
362+
char tmp_buf[1024]; \
363+
std::sprintf(tmp_buf, fmt, ##__VA_ARGS__); \
364+
char node_name[HOST_NAME_MAX]{0}; \
365+
gethostname(node_name, HOST_NAME_MAX); \
366+
std::printf("%s [ %s ] %s\n", CAPIO_LOG_SERVER_CLI_LEVEL_ERROR, node_name, tmp_buf); \
367+
std::exit(EXIT_FAILURE); \
365368
}
366369
#else
367-
#define ERR_EXIT(message, ...) \
370+
#define ERR_EXIT(fmt, ...) \
368371
if (!continue_on_error) { \
369-
std::cout << CAPIO_LOG_SERVER_CLI_LEVEL_ERROR << " [ " << node_name << " ] " << message \
370-
<< std::endl; \
371-
exit(EXIT_FAILURE); \
372+
char tmp_buf[1024]; \
373+
std::sprintf(tmp_buf, fmt, ##__VA_ARGS__); \
374+
std::printf("%s [ %s ] %s\n", CAPIO_LOG_SERVER_CLI_LEVEL_ERROR, node_name, tmp_buf); \
375+
std::exit(EXIT_FAILURE); \
372376
}
373377
#endif
374378
#define LOG(message, ...)

0 commit comments

Comments
 (0)