mirror of
https://github.com/systemd/systemd
synced 2024-09-29 21:04:12 +00:00
tree-wide: Use log_setup() everywhere
Otherwise the default log target is the console and we won't use the journal socket even if it is available.
This commit is contained in:
parent
d74ebb175a
commit
aa976d8788
|
@ -83,8 +83,7 @@ static int run(int argc, char *argv[]) {
|
|||
/* This is mostly intended to be used for scripts which want
|
||||
* to detect whether AC power is plugged in or not. */
|
||||
|
||||
log_parse_environment();
|
||||
log_open();
|
||||
log_setup();
|
||||
|
||||
r = parse_argv(argc, argv);
|
||||
if (r <= 0)
|
||||
|
|
|
@ -226,9 +226,7 @@ static int run(int argc, char *argv[]) {
|
|||
usec_t timeout;
|
||||
int r;
|
||||
|
||||
log_show_color(true);
|
||||
log_parse_environment();
|
||||
log_open();
|
||||
log_setup();
|
||||
|
||||
r = parse_argv(argc, argv);
|
||||
if (r <= 0)
|
||||
|
|
|
@ -499,8 +499,7 @@ static int run(int argc, char *argv[]) {
|
|||
|
||||
int r;
|
||||
|
||||
log_parse_environment();
|
||||
log_open();
|
||||
log_setup();
|
||||
|
||||
r = parse_argv(argc, argv);
|
||||
if (r <= 0)
|
||||
|
|
|
@ -79,8 +79,7 @@ static int run(int argc, char *argv[]) {
|
|||
uint32_t n;
|
||||
int r;
|
||||
|
||||
log_parse_environment();
|
||||
log_open();
|
||||
log_setup();
|
||||
|
||||
r = parse_argv(argc, argv);
|
||||
if (r <= 0)
|
||||
|
|
|
@ -1160,9 +1160,7 @@ static int measure_main(int argc, char *argv[]) {
|
|||
static int run(int argc, char *argv[]) {
|
||||
int r;
|
||||
|
||||
log_show_color(true);
|
||||
log_parse_environment();
|
||||
log_open();
|
||||
log_setup();
|
||||
|
||||
r = parse_argv(argc, argv);
|
||||
if (r <= 0)
|
||||
|
|
|
@ -797,9 +797,7 @@ static int run(int argc, char *argv[]) {
|
|||
size_t vks;
|
||||
int slot, slot_to_wipe, r;
|
||||
|
||||
log_show_color(true);
|
||||
log_parse_environment();
|
||||
log_open();
|
||||
log_setup();
|
||||
|
||||
r = parse_argv(argc, argv);
|
||||
if (r <= 0)
|
||||
|
|
|
@ -84,8 +84,7 @@ static int load_and_print(void) {
|
|||
static int run(int argc, char *argv[]) {
|
||||
int r;
|
||||
|
||||
log_parse_environment();
|
||||
log_open();
|
||||
log_setup();
|
||||
|
||||
if (argc > 1)
|
||||
return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "This program takes no arguments.");
|
||||
|
|
|
@ -33,8 +33,7 @@ static inline void fuzz_setup_logging(void) {
|
|||
* in a fuzzing mode, so disable most of the logging. */
|
||||
log_set_assert_return_is_critical(true);
|
||||
log_set_max_level(LOG_CRIT);
|
||||
log_parse_environment();
|
||||
log_open();
|
||||
log_setup();
|
||||
}
|
||||
|
||||
/* Force value to not be optimized away. */
|
||||
|
|
|
@ -120,8 +120,7 @@ static int hwdb_main(int argc, char *argv[]) {
|
|||
static int run(int argc, char *argv[]) {
|
||||
int r;
|
||||
|
||||
log_parse_environment();
|
||||
log_open();
|
||||
log_setup();
|
||||
|
||||
r = parse_argv(argc, argv);
|
||||
if (r <= 0)
|
||||
|
|
|
@ -1070,8 +1070,7 @@ static int run(int argc, char **argv) {
|
|||
_cleanup_free_ char *cert = NULL, *trust = NULL;
|
||||
int r;
|
||||
|
||||
log_show_color(true);
|
||||
log_parse_environment();
|
||||
log_setup();
|
||||
|
||||
/* The journal merging logic potentially needs a lot of fds. */
|
||||
(void) rlimit_nofile_bump(HIGH_RLIMIT_NOFILE);
|
||||
|
|
|
@ -764,8 +764,7 @@ static int run(int argc, char **argv) {
|
|||
bool use_journal;
|
||||
int r;
|
||||
|
||||
log_show_color(true);
|
||||
log_parse_environment();
|
||||
log_setup();
|
||||
|
||||
/* The journal merging logic potentially needs a lot of fds. */
|
||||
(void) rlimit_nofile_bump(HIGH_RLIMIT_NOFILE);
|
||||
|
|
|
@ -305,8 +305,7 @@ static int run(int argc, char *argv[]) {
|
|||
_cleanup_free_ char *message = NULL;
|
||||
int r;
|
||||
|
||||
log_open();
|
||||
log_parse_environment();
|
||||
log_setup();
|
||||
|
||||
sigbus_install();
|
||||
|
||||
|
|
|
@ -257,9 +257,7 @@ static int run(int argc, char *argv[]) {
|
|||
_cleanup_(sd_bus_flush_close_unrefp) sd_bus *bus = NULL;
|
||||
int r;
|
||||
|
||||
log_show_color(true);
|
||||
log_parse_environment();
|
||||
log_open();
|
||||
log_setup();
|
||||
|
||||
r = parse_argv(argc, argv);
|
||||
if (r <= 0)
|
||||
|
|
|
@ -190,8 +190,7 @@ static int do_umount(const char *user) {
|
|||
static int run(int argc, char *argv[]) {
|
||||
int r;
|
||||
|
||||
log_parse_environment();
|
||||
log_open();
|
||||
log_setup();
|
||||
|
||||
if (argc != 3)
|
||||
return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
|
||||
|
|
|
@ -139,8 +139,7 @@ static int run(int argc, char *argv[]) {
|
|||
_cleanup_(umount_and_freep) char *mounted_dir = NULL;
|
||||
int r;
|
||||
|
||||
log_parse_environment();
|
||||
log_open();
|
||||
log_setup();
|
||||
|
||||
r = parse_argv(argc, argv);
|
||||
if (r <= 0)
|
||||
|
|
|
@ -1492,9 +1492,7 @@ static int run(int argc, char* argv[]) {
|
|||
_cleanup_(sd_bus_flush_close_unrefp) sd_bus *bus = NULL;
|
||||
int r;
|
||||
|
||||
log_show_color(true);
|
||||
log_parse_environment();
|
||||
log_open();
|
||||
log_setup();
|
||||
|
||||
r = parse_argv(argc, argv);
|
||||
if (r <= 0)
|
||||
|
|
|
@ -5777,8 +5777,7 @@ static int run(int argc, char *argv[]) {
|
|||
_cleanup_(fw_ctx_freep) FirewallContext *fw_ctx = NULL;
|
||||
pid_t pid = 0;
|
||||
|
||||
log_parse_environment();
|
||||
log_open();
|
||||
log_setup();
|
||||
|
||||
arg_privileged = getuid() == 0;
|
||||
|
||||
|
|
|
@ -56,7 +56,7 @@ static int run(int argc, char *argv[]) {
|
|||
int r;
|
||||
|
||||
log_set_max_level(LOG_DEBUG);
|
||||
log_open();
|
||||
log_setup();
|
||||
|
||||
r = userns_restrict_install(/* pin= */ false, &obj);
|
||||
if (ERRNO_IS_NOT_SUPPORTED(r)) {
|
||||
|
|
|
@ -119,9 +119,7 @@ static int run(int argc, char* argv[]) {
|
|||
|
||||
int r;
|
||||
|
||||
log_show_color(true);
|
||||
log_parse_environment();
|
||||
log_open();
|
||||
log_setup();
|
||||
|
||||
r = parse_argv(argc, argv);
|
||||
if (r <= 0)
|
||||
|
|
|
@ -8005,9 +8005,7 @@ static int run(int argc, char *argv[]) {
|
|||
bool node_is_our_loop = false;
|
||||
int r;
|
||||
|
||||
log_show_color(true);
|
||||
log_parse_environment();
|
||||
log_open();
|
||||
log_setup();
|
||||
|
||||
r = parse_argv(argc, argv);
|
||||
if (r <= 0)
|
||||
|
|
|
@ -218,9 +218,7 @@ static int parse_argv(int argc, char *argv[]) {
|
|||
static int run(int argc, char* argv[]) {
|
||||
int r;
|
||||
|
||||
log_show_color(true);
|
||||
log_parse_environment();
|
||||
log_open();
|
||||
log_setup();
|
||||
|
||||
r = parse_argv(argc, argv);
|
||||
if (r <= 0)
|
||||
|
|
|
@ -2320,9 +2320,7 @@ static int run(int argc, char* argv[]) {
|
|||
_cleanup_(sd_bus_flush_close_unrefp) sd_bus *bus = NULL;
|
||||
int r;
|
||||
|
||||
log_show_color(true);
|
||||
log_parse_environment();
|
||||
log_open();
|
||||
log_setup();
|
||||
|
||||
if (invoked_as(argv, "run0"))
|
||||
r = parse_argv_sudo_mode(argc, argv);
|
||||
|
|
|
@ -970,6 +970,5 @@ void log_setup_generator(void) {
|
|||
log_set_target(LOG_TARGET_JOURNAL_OR_KMSG);
|
||||
}
|
||||
|
||||
log_parse_environment();
|
||||
(void) log_open();
|
||||
log_setup();
|
||||
}
|
||||
|
|
|
@ -446,9 +446,7 @@ static int run(int argc, char **argv) {
|
|||
_cleanup_strv_free_ char **exec_argv = NULL;
|
||||
int r, n;
|
||||
|
||||
log_show_color(true);
|
||||
log_parse_environment();
|
||||
log_open();
|
||||
log_setup();
|
||||
|
||||
r = parse_argv(argc, argv);
|
||||
if (r <= 0)
|
||||
|
|
|
@ -676,8 +676,7 @@ static int run(int argc, char *argv[]) {
|
|||
_unused_ _cleanup_(notify_on_cleanup) const char *notify_stop = NULL;
|
||||
int r, n, fd;
|
||||
|
||||
log_parse_environment();
|
||||
log_open();
|
||||
log_setup();
|
||||
|
||||
r = parse_argv(argc, argv);
|
||||
if (r <= 0)
|
||||
|
|
|
@ -105,9 +105,7 @@ static int run(int argc, char *argv[]) {
|
|||
bool is_unix;
|
||||
int r, in_fd, out_fd;
|
||||
|
||||
log_set_target(LOG_TARGET_JOURNAL_OR_KMSG);
|
||||
log_parse_environment();
|
||||
log_open();
|
||||
log_setup();
|
||||
|
||||
r = parse_argv(argc, argv);
|
||||
if (r <= 0)
|
||||
|
|
|
@ -1111,9 +1111,7 @@ static int run(int argc, char* argv[]) {
|
|||
_cleanup_(context_done) Context context = {};
|
||||
int r;
|
||||
|
||||
log_show_color(true);
|
||||
log_parse_environment();
|
||||
log_open();
|
||||
log_setup();
|
||||
|
||||
r = parse_argv(argc, argv);
|
||||
if (r <= 0)
|
||||
|
|
|
@ -148,7 +148,7 @@ TEST(rearrange_stdio) {
|
|||
assert_se(rearrange_stdio(-EBADF, -EBADF, -EBADF) >= 0);
|
||||
/* Reconfigure logging after rearranging stdout/stderr, so we still log to somewhere if the
|
||||
* following tests fail, making it slightly less annoying to debug */
|
||||
log_set_target(LOG_TARGET_KMSG);
|
||||
log_set_target(LOG_TARGET_JOURNAL_OR_KMSG);
|
||||
log_open();
|
||||
|
||||
assert_se(fd_get_path(STDIN_FILENO, &path) >= 0);
|
||||
|
|
|
@ -413,10 +413,8 @@ static int run(int argc, char *argv[]) {
|
|||
uint16_t word;
|
||||
int r, peripheral_device_type = -1;
|
||||
|
||||
log_set_target(LOG_TARGET_AUTO);
|
||||
udev_parse_config();
|
||||
log_parse_environment();
|
||||
log_open();
|
||||
(void) udev_parse_config();
|
||||
log_setup();
|
||||
|
||||
r = parse_argv(argc, argv);
|
||||
if (r <= 0)
|
||||
|
|
|
@ -959,10 +959,8 @@ static int run(int argc, char *argv[]) {
|
|||
_cleanup_(context_clear) Context c = CONTEXT_EMPTY;
|
||||
int r;
|
||||
|
||||
log_set_target(LOG_TARGET_AUTO);
|
||||
udev_parse_config();
|
||||
log_parse_environment();
|
||||
log_open();
|
||||
(void) udev_parse_config();
|
||||
log_setup();
|
||||
|
||||
r = parse_argv(argc, argv);
|
||||
if (r <= 0)
|
||||
|
|
|
@ -685,10 +685,8 @@ static int run(int argc, char* const* argv) {
|
|||
size_t size;
|
||||
int r;
|
||||
|
||||
log_set_target(LOG_TARGET_AUTO);
|
||||
udev_parse_config();
|
||||
log_parse_environment();
|
||||
log_open();
|
||||
(void) udev_parse_config();
|
||||
log_setup();
|
||||
|
||||
r = parse_argv(argc, argv);
|
||||
if (r <= 0)
|
||||
|
|
|
@ -70,10 +70,8 @@ static int run(int argc, char **argv) {
|
|||
ssize_t desc_len;
|
||||
int r;
|
||||
|
||||
log_set_target(LOG_TARGET_AUTO);
|
||||
udev_parse_config();
|
||||
log_parse_environment();
|
||||
log_open();
|
||||
(void) udev_parse_config();
|
||||
log_setup();
|
||||
|
||||
r = parse_argv(argc, argv);
|
||||
if (r <= 0)
|
||||
|
|
|
@ -480,10 +480,8 @@ int main(int argc, char **argv) {
|
|||
char maj_min_dev[MAX_PATH_LEN];
|
||||
int newargc;
|
||||
|
||||
log_set_target(LOG_TARGET_AUTO);
|
||||
udev_parse_config();
|
||||
log_parse_environment();
|
||||
log_open();
|
||||
(void) udev_parse_config();
|
||||
log_setup();
|
||||
|
||||
/*
|
||||
* Get config file options.
|
||||
|
|
|
@ -79,8 +79,7 @@ int builtin_main(int argc, char *argv[], void *userdata) {
|
|||
UdevBuiltinCommand cmd;
|
||||
int r;
|
||||
|
||||
log_set_max_level(LOG_DEBUG);
|
||||
log_parse_environment();
|
||||
log_setup();
|
||||
|
||||
r = parse_argv(argc, argv);
|
||||
if (r <= 0)
|
||||
|
|
|
@ -96,8 +96,7 @@ int test_main(int argc, char *argv[], void *userdata) {
|
|||
sigset_t mask, sigmask_orig;
|
||||
int r;
|
||||
|
||||
log_set_max_level(LOG_DEBUG);
|
||||
log_parse_environment();
|
||||
log_setup();
|
||||
|
||||
r = parse_argv(argc, argv);
|
||||
if (r <= 0)
|
||||
|
|
|
@ -123,7 +123,7 @@ static int run(int argc, char *argv[]) {
|
|||
if (invoked_as(argv, "udevd"))
|
||||
return run_udevd(argc, argv);
|
||||
|
||||
udev_parse_config();
|
||||
(void) udev_parse_config();
|
||||
log_setup();
|
||||
|
||||
r = parse_argv(argc, argv);
|
||||
|
|
|
@ -289,8 +289,7 @@ int run_udevd(int argc, char *argv[]) {
|
|||
int fd_ctrl = -EBADF, fd_uevent = -EBADF;
|
||||
int r;
|
||||
|
||||
log_set_target(LOG_TARGET_AUTO);
|
||||
log_open();
|
||||
log_setup();
|
||||
|
||||
manager = manager_new();
|
||||
if (!manager)
|
||||
|
@ -298,9 +297,6 @@ int run_udevd(int argc, char *argv[]) {
|
|||
|
||||
manager_parse_udev_config(manager);
|
||||
|
||||
log_parse_environment();
|
||||
log_open(); /* Done again to update after reading configuration. */
|
||||
|
||||
r = parse_argv(argc, argv, manager);
|
||||
if (r <= 0)
|
||||
return r;
|
||||
|
|
|
@ -216,9 +216,7 @@ static int parse_argv(int argc, char *argv[]) {
|
|||
static int run(int argc, char *argv[]) {
|
||||
int r;
|
||||
|
||||
log_show_color(true);
|
||||
log_parse_environment();
|
||||
log_open();
|
||||
log_setup();
|
||||
|
||||
r = parse_argv(argc, argv);
|
||||
if (r <= 0)
|
||||
|
|
Loading…
Reference in a new issue