chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
core: introduce the concept of AssertXYZ= similar to ConditionXYZ=, but fatal for...
[elogind.git]
/
src
/
journal-remote
/
journal-remote.c
diff --git
a/src/journal-remote/journal-remote.c
b/src/journal-remote/journal-remote.c
index 8a72c6eb2b5711b26da48161cb444d10bcce9334..7239b8cc6d0a191e53bcaa594922bc1f1c59289a 100644
(file)
--- a/
src/journal-remote/journal-remote.c
+++ b/
src/journal-remote/journal-remote.c
@@
-398,7
+398,7
@@
static int add_source(RemoteServer *s, int fd, char* name, bool own_name) {
goto error;
}
goto error;
}
- r = sd_event_source_set_
name
(source->event, name);
+ r = sd_event_source_set_
description
(source->event, name);
if (r < 0) {
log_error("Failed to set source name for fd:%d: %s", fd, strerror(-r));
goto error;
if (r < 0) {
log_error("Failed to set source name for fd:%d: %s", fd, strerror(-r));
goto error;
@@
-426,7
+426,7
@@
static int add_raw_socket(RemoteServer *s, int fd) {
snprintf(name, sizeof(name), "raw-socket-%d", fd);
snprintf(name, sizeof(name), "raw-socket-%d", fd);
- r = sd_event_source_set_
name
(s->listen_event, name);
+ r = sd_event_source_set_
description
(s->listen_event, name);
if (r < 0)
return r;
if (r < 0)
return r;
@@
-505,11
+505,11
@@
static int process_http_upload(
assert(source);
assert(source);
- log_
debug("request_handler_upload
: connection %p, %zu bytes",
- connection, *upload_data_size);
+ log_
trace("%s
: connection %p, %zu bytes",
+
__func__,
connection, *upload_data_size);
if (*upload_data_size) {
if (*upload_data_size) {
- log_
debug
("Received %zu bytes", *upload_data_size);
+ log_
trace
("Received %zu bytes", *upload_data_size);
r = push_data(source, upload_data, *upload_data_size);
if (r < 0)
r = push_data(source, upload_data, *upload_data_size);
if (r < 0)
@@
-572,7
+572,7
@@
static int request_handler(
assert(url);
assert(method);
assert(url);
assert(method);
- log_
debug
("Handling a connection %s %s %s", method, url, version);
+ log_
trace
("Handling a connection %s %s %s", method, url, version);
if (*connection_cls)
return process_http_upload(connection,
if (*connection_cls)
return process_http_upload(connection,
@@
-724,7
+724,7
@@
static int setup_microhttpd_server(RemoteServer *s,
goto error;
}
goto error;
}
- r = sd_event_source_set_
name
(d->event, "epoll-fd");
+ r = sd_event_source_set_
description
(d->event, "epoll-fd");
if (r < 0) {
log_error("Failed to set source name: %s", strerror(-r));
goto error;
if (r < 0) {
log_error("Failed to set source name: %s", strerror(-r));
goto error;
@@
-803,18
+803,10
@@
static int setup_signals(RemoteServer *s) {
if (r < 0)
return r;
if (r < 0)
return r;
- r = sd_event_source_set_name(s->sigterm_event, "sigterm");
- if (r < 0)
- return r;
-
r = sd_event_add_signal(s->events, &s->sigint_event, SIGINT, NULL, s);
if (r < 0)
return r;
r = sd_event_add_signal(s->events, &s->sigint_event, SIGINT, NULL, s);
if (r < 0)
return r;
- r = sd_event_source_set_name(s->sigint_event, "sigint");
- if (r < 0)
- return r;
-
return 0;
}
return 0;
}