ee36266a55
There are two cases where we want to stop printing to stderr: if it's
closed, and if pasta spawned a shell (and --debug wasn't given).
But if passt is running in foreground, we currently stop to report any
message, even error messages, once we're ready, as reported by
Laurent, because we set the log_runtime flag, which we use to indicate
we're ready, regardless of whether we're running in foreground or not.
Turn that flag (back) to log_stderr, and set it only when we really
want to stop printing to stderr.
Reported-by: Laurent Vivier <lvivier@redhat.com>
Fixes: afd9cdc9bb ("log, passt: Always print to stderr before initialisation is complete")
Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
61 lines
1.8 KiB
C
61 lines
1.8 KiB
C
/* SPDX-License-Identifier: GPL-2.0-or-later
|
|
* Copyright (c) 2022 Red Hat GmbH
|
|
* Author: Stefano Brivio <sbrivio@redhat.com>
|
|
*/
|
|
|
|
#ifndef LOG_H
|
|
#define LOG_H
|
|
|
|
#include <stdbool.h>
|
|
#include <syslog.h>
|
|
|
|
#define LOGFILE_SIZE_DEFAULT (1024 * 1024UL)
|
|
#define LOGFILE_CUT_RATIO 30 /* When full, cut ~30% size */
|
|
#define LOGFILE_SIZE_MIN (5UL * MAX(BUFSIZ, PAGE_SIZE))
|
|
|
|
void vlogmsg(bool newline, int pri, const char *format, va_list ap);
|
|
void logmsg(bool newline, int pri, const char *format, ...)
|
|
__attribute__((format(printf, 3, 4)));
|
|
void logmsg_perror(int pri, const char *format, ...)
|
|
__attribute__((format(printf, 2, 3)));
|
|
|
|
#define err(...) logmsg(true, LOG_ERR, __VA_ARGS__)
|
|
#define warn(...) logmsg(true, LOG_WARNING, __VA_ARGS__)
|
|
#define info(...) logmsg(true, LOG_INFO, __VA_ARGS__)
|
|
#define debug(...) logmsg(true, LOG_DEBUG, __VA_ARGS__)
|
|
|
|
#define err_perror(...) logmsg_perror( LOG_ERR, __VA_ARGS__)
|
|
#define warn_perror(...) logmsg_perror( LOG_WARNING, __VA_ARGS__)
|
|
#define info_perror(...) logmsg_perror( LOG_INFO, __VA_ARGS__)
|
|
#define debug_perror(...) logmsg_perror( LOG_DEBUG, __VA_ARGS__)
|
|
|
|
#define die(...) \
|
|
do { \
|
|
err(__VA_ARGS__); \
|
|
exit(EXIT_FAILURE); \
|
|
} while (0)
|
|
|
|
#define die_perror(...) \
|
|
do { \
|
|
err_perror(__VA_ARGS__); \
|
|
exit(EXIT_FAILURE); \
|
|
} while (0)
|
|
|
|
extern int log_trace;
|
|
extern bool log_conf_parsed;
|
|
extern bool log_stderr;
|
|
extern struct timespec log_start;
|
|
|
|
void trace_init(int enable);
|
|
#define trace(...) \
|
|
do { \
|
|
if (log_trace) \
|
|
debug(__VA_ARGS__); \
|
|
} while (0)
|
|
|
|
void __openlog(const char *ident, int option, int facility);
|
|
void logfile_init(const char *name, const char *path, size_t size);
|
|
void passt_vsyslog(bool newline, int pri, const char *format, va_list ap);
|
|
void __setlogmask(int mask);
|
|
|
|
#endif /* LOG_H */
|