activate: reduce log settings to normal

[elogind.git] / src / activate / activate.c

diff --git a/src/activate/activate.c b/src/activate/activate.c
index 83d25b13af9063e4c875c95e51b48c4e160644fd..738cd83c528da68808fab432b911de475edb3361 100644 (file)
--- a/src/activate/activate.c
+++ b/src/activate/activate.c
@@ -55,26 +55,6 @@ static int add_epoll(int epoll_fd, int fd) {
         return r;
 }
 
         return r;
 }
 

-static int set_nocloexec(int fd) {
-        int flags;
-
-        flags = fcntl(fd, F_GETFD);
-        if (flags < 0) {
-                log_error("Querying flags for fd:%d: %m", fd);
-                return -errno;
-        }
-
-        if (!(flags & FD_CLOEXEC))
-                return 0;
-
-        if (fcntl(fd, F_SETFD, flags & ~FD_CLOEXEC) < 0) {
-                log_error("Settings flags for fd:%d: %m", fd);
-                return -errno;
-        }
-
-        return 0;
-}
-

 static int print_socket(const char* desc, int fd) {
         int r;
         SocketAddress addr = {
 static int print_socket(const char* desc, int fd) {
         int r;
         SocketAddress addr = {


@@ -112,7 +92,7 @@ static int print_socket(const char* desc, int fd) {
 }
 
 static int open_sockets(int *epoll_fd, bool accept) {
 }
 
 static int open_sockets(int *epoll_fd, bool accept) {

-        int n, fd;
+        int n, fd, r;

         int count = 0;
         char **address;
 
         int count = 0;
         char **address;
 


@@ -128,11 +108,9 @@ static int open_sockets(int *epoll_fd, bool accept) {
                 log_debug("Received descriptor fd:%d", fd);
                 print_socket("Listening on", fd);
 
                 log_debug("Received descriptor fd:%d", fd);
                 print_socket("Listening on", fd);
 

-                if (!arg_accept) {
-                        int r = set_nocloexec(fd);
-                        if (r < 0)
-                                return r;
-                }
+                r = fd_cloexec(fd, arg_accept);
+                if (r < 0)
+                        return r;

 
                 count ++;
         }
 
                 count ++;
         }


@@ -160,8 +138,9 @@ static int open_sockets(int *epoll_fd, bool accept) {
                 return -errno;
         }
 
                 return -errno;
         }
 

+

         for (fd = SD_LISTEN_FDS_START; fd < SD_LISTEN_FDS_START + count; fd++) {
         for (fd = SD_LISTEN_FDS_START; fd < SD_LISTEN_FDS_START + count; fd++) {

-                int r = add_epoll(*epoll_fd, fd);
+                r = add_epoll(*epoll_fd, fd);

                 if (r < 0)
                         return r;
         }
                 if (r < 0)
                         return r;
         }


@@ -336,7 +315,7 @@ static int parse_argv(int argc, char *argv[]) {
                 { "listen",       required_argument, NULL, 'l'           },
                 { "accept",       no_argument,       NULL, 'a'           },
                 { "environment",  required_argument, NULL, 'E'           },
                 { "listen",       required_argument, NULL, 'l'           },
                 { "accept",       no_argument,       NULL, 'a'           },
                 { "environment",  required_argument, NULL, 'E'           },

-                { NULL,           0,                 NULL, 0             }
+                {}

         };
 
         int c;
         };
 
         int c;


@@ -347,8 +326,7 @@ static int parse_argv(int argc, char *argv[]) {
         while ((c = getopt_long(argc, argv, "+hl:saE:", options, NULL)) >= 0)
                 switch(c) {
                 case 'h':
         while ((c = getopt_long(argc, argv, "+hl:saE:", options, NULL)) >= 0)
                 switch(c) {
                 case 'h':

-                        help();
-                        return 0 /* done */;
+                        return help();

 
                 case ARG_VERSION:
                         puts(PACKAGE_STRING);
 
                 case ARG_VERSION:
                         puts(PACKAGE_STRING);


@@ -379,8 +357,7 @@ static int parse_argv(int argc, char *argv[]) {
                         return -EINVAL;
 
                 default:
                         return -EINVAL;
 
                 default:

-                        log_error("Unknown option code %c", c);
-                        return -EINVAL;
+                        assert_not_reached("Unhandled option");

                 }
 
         if (optind == argc) {
                 }
 
         if (optind == argc) {


@@ -398,9 +375,8 @@ int main(int argc, char **argv, char **envp) {
         int r, n;
         int epoll_fd = -1;
 
         int r, n;
         int epoll_fd = -1;
 

-        log_set_max_level(LOG_DEBUG);
-        log_show_color(true);

         log_parse_environment();
         log_parse_environment();

+        log_open();

 
         r = parse_argv(argc, argv);
         if (r <= 0)
 
         r = parse_argv(argc, argv);
         if (r <= 0)


@@ -414,7 +390,7 @@ int main(int argc, char **argv, char **envp) {
         if (n < 0)
                 return EXIT_FAILURE;
 
         if (n < 0)
                 return EXIT_FAILURE;
 

-        while (true) {
+        for (;;) {

                 struct epoll_event event;
 
                 r = epoll_wait(epoll_fd, &event, 1, -1);
                 struct epoll_event event;
 
                 r = epoll_wait(epoll_fd, &event, 1, -1);