X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fjournal-remote%2Fjournal-remote.c;h=7239b8cc6d0a191e53bcaa594922bc1f1c59289a;hb=59fccdc587bc179c1638916ee16a24099f94f81f;hp=8a72c6eb2b5711b26da48161cb444d10bcce9334;hpb=a7736b14de340c01580dd4c09145c846d21211b9;p=elogind.git

diff --git a/src/journal-remote/journal-remote.c b/src/journal-remote/journal-remote.c
index 8a72c6eb2..7239b8cc6 100644
--- 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;
         }
 
-        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;
@@ -426,7 +426,7 @@ static int add_raw_socket(RemoteServer *s, int 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;
 
@@ -505,11 +505,11 @@ static int process_http_upload(
 
         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) {
-                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)
@@ -572,7 +572,7 @@ static int request_handler(
         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,
@@ -724,7 +724,7 @@ static int setup_microhttpd_server(RemoteServer *s,
                 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;
@@ -803,18 +803,10 @@ static int setup_signals(RemoteServer *s) {
         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_source_set_name(s->sigint_event, "sigint");
-        if (r < 0)
-                return r;
-
         return 0;
 }