shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-01-22 22:03:43 +03:00
Code

journal-remote: better error message on failure

Browse Source 
Return a proper code instead of simply NULL for failure.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2014-10-22 23:18:47 -05:00
parent 50a0b07175
commit 9ce998b937
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/journal-remote/journal-remote.c
View File

@ -449,33 +449,32 @@ static int setup_raw_socket(RemoteServer *s, const char *address) {
********************************************************************** **********************************************************************
**********************************************************************/ **********************************************************************/
static RemoteSource *request_meta(void **connection_cls, int fd, char *hostname) { static int request_meta(void **connection_cls, int fd, char *hostname) {
RemoteSource *source; RemoteSource *source;
Writer *writer; Writer *writer;
int r; int r;
assert(connection_cls); assert(connection_cls);
if (*connection_cls) if (*connection_cls)
return *connection_cls; return 0;
r = get_writer(server, hostname, &writer); r = get_writer(server, hostname, &writer);
if (r < 0) { if (r < 0) {
log_warning("Failed to get writer for source %s: %s", log_warning("Failed to get writer for source %s: %s",
hostname, strerror(-r)); hostname, strerror(-r));
return NULL; return r;
} }
source = source_new(fd, true, hostname, writer); source = source_new(fd, true, hostname, writer);
if (!source) { if (!source) {
log_oom();
writer_unref(writer); writer_unref(writer);
return NULL; return log_oom();
} }
log_debug("Added RemoteSource as connection metadata %p", source); log_debug("Added RemoteSource as connection metadata %p", source);
*connection_cls = source; *connection_cls = source;
return source; return 0;
} }
static void request_meta_free(void *cls, static void request_meta_free(void *cls,
@ -487,9 +486,11 @@ static void request_meta_free(void *cls,
assert(connection_cls); assert(connection_cls);
s = *connection_cls; s = *connection_cls;
log_debug("Cleaning up connection metadata %p", s); if (s) {
source_free(s); log_debug("Cleaning up connection metadata %p", s);
*connection_cls = NULL; source_free(s);
*connection_cls = NULL;
}
} }
static int process_http_upload( static int process_http_upload(
@ -622,8 +623,13 @@ static int request_handler(
assert(hostname); assert(hostname);
if (!request_meta(connection_cls, fd, hostname)) r = request_meta(connection_cls, fd, hostname);
if (r == -ENOMEM)
return respond_oom(connection); return respond_oom(connection);
else if (r < 0)
return mhd_respond(connection, MHD_HTTP_INTERNAL_SERVER_ERROR,
strerror(-r));
hostname = NULL; hostname = NULL;
return MHD_YES; return MHD_YES;
} }