X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fjournal-remote%2Fjournal-remote.c;h=6ec5ad2e77a2f152c4c488f5adcbeb9f5856834c;hb=7bdb04298fd8b3de7adf2e0e547ef7dd953b809e;hp=d1df83fba09c10867bfa834d3d8d7018bda6c680;hpb=c33b329709ebe2755181980a050d02ec7c81ed87;p=elogind.git diff --git a/src/journal-remote/journal-remote.c b/src/journal-remote/journal-remote.c index d1df83fba..6ec5ad2e7 100644 --- a/src/journal-remote/journal-remote.c +++ b/src/journal-remote/journal-remote.c @@ -84,17 +84,15 @@ static int spawn_child(const char* child, char** argv) { pid_t parent_pid, child_pid; int r; - if (pipe(fd) < 0) { - log_error("Failed to create pager pipe: %m"); - return -errno; - } + if (pipe(fd) < 0) + return log_error_errno(errno, "Failed to create pager pipe: %m"); parent_pid = getpid(); child_pid = fork(); if (child_pid < 0) { r = -errno; - log_error("Failed to fork: %m"); + log_error_errno(errno, "Failed to fork: %m"); safe_close_pair(fd); return r; } @@ -103,7 +101,7 @@ static int spawn_child(const char* child, char** argv) { if (child_pid == 0) { r = dup2(fd[1], STDOUT_FILENO); if (r < 0) { - log_error("Failed to dup pipe to stdout: %m"); + log_error_errno(errno, "Failed to dup pipe to stdout: %m"); _exit(EXIT_FAILURE); } @@ -119,13 +117,13 @@ static int spawn_child(const char* child, char** argv) { _exit(EXIT_SUCCESS); execvp(child, argv); - log_error("Failed to exec child %s: %m", child); + log_error_errno(errno, "Failed to exec child %s: %m", child); _exit(EXIT_FAILURE); } r = close(fd[1]); if (r < 0) - log_warning("Failed to close write end of pipe: %m"); + log_warning_errno(errno, "Failed to close write end of pipe: %m"); return fd[0]; } @@ -140,7 +138,7 @@ static int spawn_curl(const char* url) { r = spawn_child("curl", argv); if (r < 0) - log_error("Failed to spawn curl: %m"); + log_error_errno(errno, "Failed to spawn curl: %m"); return r; } @@ -150,20 +148,16 @@ static int spawn_getter(const char *getter, const char *url) { assert(getter); r = strv_split_quoted(&words, getter, false); - if (r < 0) { - log_error_errno(r, "Failed to split getter option: %m"); - return r; - } + if (r < 0) + return log_error_errno(r, "Failed to split getter option: %m"); r = strv_extend(&words, url); - if (r < 0) { - log_error_errno(r, "Failed to create command line: %m"); - return r; - } + if (r < 0) + return log_error_errno(r, "Failed to create command line: %m"); r = spawn_child(words[0], words); if (r < 0) - log_error("Failed to spawn getter %s: %m", getter); + log_error_errno(errno, "Failed to spawn getter %s: %m", getter); return r; } @@ -320,11 +314,9 @@ static int get_source_for_fd(RemoteServer *s, return log_oom(); r = get_writer(s, name, &writer); - if (r < 0) { - log_warning_errno(r, "Failed to get writer for source %s: %m", - name); - return r; - } + if (r < 0) + return log_warning_errno(r, "Failed to get writer for source %s: %m", + name); if (s->sources[fd] == NULL) { s->sources[fd] = source_new(fd, false, name, writer); @@ -459,11 +451,9 @@ static int request_meta(void **connection_cls, int fd, char *hostname) { return 0; r = get_writer(server, hostname, &writer); - if (r < 0) { - log_warning_errno(r, "Failed to get writer for source %s: %m", - hostname); - return r; - } + if (r < 0) + return log_warning_errno(r, "Failed to get writer for source %s: %m", + hostname); source = source_new(fd, true, hostname, writer); if (!source) { @@ -661,10 +651,8 @@ static int setup_microhttpd_server(RemoteServer *s, assert(fd >= 0); r = fd_nonblock(fd, true); - if (r < 0) { - log_error_errno(r, "Failed to make fd:%d nonblocking: %m", fd); - return r; - } + if (r < 0) + return log_error_errno(r, "Failed to make fd:%d nonblocking: %m", fd); if (key) { assert(cert); @@ -840,10 +828,8 @@ static int remoteserver_init(RemoteServer *s, } r = sd_event_default(&s->events); - if (r < 0) { - log_error_errno(r, "Failed to allocate event loop: %m"); - return r; - } + if (r < 0) + return log_error_errno(r, "Failed to allocate event loop: %m"); setup_signals(s); @@ -855,10 +841,9 @@ static int remoteserver_init(RemoteServer *s, return r; n = sd_listen_fds(true); - if (n < 0) { - log_error_errno(n, "Failed to read listening file descriptors from environment: %m"); - return n; - } else + if (n < 0) + return log_error_errno(n, "Failed to read listening file descriptors from environment: %m"); + else log_info("Received %d descriptors", n); if (MAX(http_socket, https_socket) >= SD_LISTEN_FDS_START + n) { @@ -880,10 +865,8 @@ static int remoteserver_init(RemoteServer *s, char *hostname; r = getnameinfo_pretty(fd, &hostname); - if (r < 0) { - log_error_errno(r, "Failed to retrieve remote name: %m"); - return r; - } + if (r < 0) + return log_error_errno(r, "Failed to retrieve remote name: %m"); log_info("Received a connection socket (fd:%d) from %s", fd, hostname); @@ -894,11 +877,9 @@ static int remoteserver_init(RemoteServer *s, return -EINVAL; } - if(r < 0) { - log_error_errno(r, "Failed to register socket (fd:%d): %m", - fd); - return r; - } + if (r < 0) + return log_error_errno(r, "Failed to register socket (fd:%d): %m", + fd); } if (arg_url) { @@ -957,10 +938,8 @@ static int remoteserver_init(RemoteServer *s, log_info("Reading file %s...", *file); fd = open(*file, O_RDONLY|O_CLOEXEC|O_NOCTTY|O_NONBLOCK); - if (fd < 0) { - log_error("Failed to open %s: %m", *file); - return -errno; - } + if (fd < 0) + return log_error_errno(errno, "Failed to open %s: %m", *file); output_name = *file; } @@ -1070,10 +1049,8 @@ static int accept_connection(const char* type, int fd, log_debug("Accepting new %s connection on fd:%d", type, fd); fd2 = accept4(fd, &addr->sockaddr.sa, &addr->size, SOCK_NONBLOCK|SOCK_CLOEXEC); - if (fd2 < 0) { - log_error("accept() on fd:%d failed: %m", fd); - return -errno; - } + if (fd2 < 0) + return log_error_errno(errno, "accept() on fd:%d failed: %m", fd); switch(socket_address_family(addr)) { case AF_INET: @@ -1154,10 +1131,10 @@ static int parse_config(void) { { "Remote", "TrustedCertificateFile", config_parse_path, 0, &arg_trust }, {}}; - return config_parse(NULL, PKGSYSCONFDIR "/journal-remote.conf", NULL, - "Remote\0", - config_item_table_lookup, items, - false, false, true, NULL); + return config_parse_many(PKGSYSCONFDIR "/journal-remote.conf", + CONF_DIRS_NULSTR("systemd/journal-remote.conf"), + "Remote\0", config_item_table_lookup, items, + false, NULL); } static void help(void) { @@ -1460,28 +1437,22 @@ static int load_certificates(char **key, char **cert, char **trust) { int r; r = read_full_file(arg_key ?: PRIV_KEY_FILE, key, NULL); - if (r < 0) { - log_error_errno(r, "Failed to read key from file '%s': %m", - arg_key ?: PRIV_KEY_FILE); - return r; - } + if (r < 0) + return log_error_errno(r, "Failed to read key from file '%s': %m", + arg_key ?: PRIV_KEY_FILE); r = read_full_file(arg_cert ?: CERT_FILE, cert, NULL); - if (r < 0) { - log_error_errno(r, "Failed to read certificate from file '%s': %m", - arg_cert ?: CERT_FILE); - return r; - } + if (r < 0) + return log_error_errno(r, "Failed to read certificate from file '%s': %m", + arg_cert ?: CERT_FILE); if (arg_trust_all) log_info("Certificate checking disabled."); else { r = read_full_file(arg_trust ?: TRUST_FILE, trust, NULL); - if (r < 0) { - log_error_errno(r, "Failed to read CA certificate file '%s': %m", - arg_trust ?: TRUST_FILE); - return r; - } + if (r < 0) + return log_error_errno(r, "Failed to read CA certificate file '%s': %m", + arg_trust ?: TRUST_FILE); } return 0;