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 7fcb0a97c495df868eedbf95b2cb904ad101d724..738cd83c528da68808fab432b911de475edb3361 100644 (file)
--- a/src/activate/activate.c
+++ b/src/activate/activate.c
@@ -38,6 +38,7 @@
 static char** arg_listen = NULL;
 static bool arg_accept = false;
 static char** arg_args = NULL;
 static char** arg_listen = NULL;
 static bool arg_accept = false;
 static char** arg_args = NULL;

+static char** arg_environ = NULL;

 
 static int add_epoll(int epoll_fd, int fd) {
         int r;
 
 static int add_epoll(int epoll_fd, int fd) {
         int r;


@@ -54,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 = {


@@ -111,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;
 


@@ -127,15 +108,18 @@ 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 ++;
         }
 

+        /** Note: we leak some fd's on error here. I doesn't matter
+         *  much, since the program will exit immediately anyway, but
+         *  would be a pain to fix.
+         */
+

         STRV_FOREACH(address, arg_listen) {
                 log_info("Opening address %s", *address);
 
         STRV_FOREACH(address, arg_listen) {
                 log_info("Opening address %s", *address);
 


@@ -154,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;
         }


@@ -163,15 +148,33 @@ static int open_sockets(int *epoll_fd, bool accept) {
         return count;
 }
 
         return count;
 }
 

-static int launch(char* name, char **argv, char **environ, int fds) {
-        unsigned n_env = 0;
-        char* envp[7] = {NULL}; /* PATH, TERM, HOME, USER, LISTEN_FDS, LISTEN_PID */
+static int launch(char* name, char **argv, char **env, int fds) {
+        unsigned n_env = 0, length;
+        _cleanup_strv_free_ char **envp = NULL;
+        char **s;

         static const char* tocopy[] = {"TERM=", "PATH=", "USER=", "HOME="};
         static const char* tocopy[] = {"TERM=", "PATH=", "USER=", "HOME="};

-        char _cleanup_free_ *tmp = NULL;
+        _cleanup_free_ char *tmp = NULL;

         unsigned i;
 
         unsigned i;
 

+        length = strv_length(arg_environ);
+        /* PATH, TERM, HOME, USER, LISTEN_FDS, LISTEN_PID, NULL */
+        envp = new(char *, length + 7);
+
+        STRV_FOREACH(s, arg_environ) {
+                if (strchr(*s, '='))
+                        envp[n_env++] = *s;
+                else {
+                        _cleanup_free_ char *p = strappend(*s, "=");
+                        if (!p)
+                                return log_oom();
+                        envp[n_env] = strv_find_prefix(env, p);
+                        if (envp[n_env])
+                                n_env ++;
+                }
+        }
+

         for (i = 0; i < ELEMENTSOF(tocopy); i++) {
         for (i = 0; i < ELEMENTSOF(tocopy); i++) {

-                envp[n_env] = strv_find_prefix(environ, tocopy[i]);
+                envp[n_env] = strv_find_prefix(env, tocopy[i]);

                 if (envp[n_env])
                         n_env ++;
         }
                 if (envp[n_env])
                         n_env ++;
         }


@@ -190,11 +193,11 @@ static int launch(char* name, char **argv, char **environ, int fds) {
         return -errno;
 }
 
         return -errno;
 }
 

-static int launch1(const char* child, char** argv, char **environ, int fd) {
+static int launch1(const char* child, char** argv, char **env, int fd) {

         pid_t parent_pid, child_pid;
         int r;
 
         pid_t parent_pid, child_pid;
         int r;
 

-        char _cleanup_free_ *tmp = NULL;
+        _cleanup_free_ char *tmp = NULL;

         tmp = strv_join(argv, " ");
         if (!tmp)
                 return log_oom();
         tmp = strv_join(argv, " ");
         if (!tmp)
                 return log_oom();


@@ -266,16 +269,15 @@ static int do_accept(const char* name, char **argv, char **envp, int fd) {
 }
 
 /* SIGCHLD handler. */
 }
 
 /* SIGCHLD handler. */

-static void sigchld_hdl(int sig, siginfo_t *t, void *data)
-{
+static void sigchld_hdl(int sig, siginfo_t *t, void *data) {

         log_info("Child %d died with code %d", t->si_pid, t->si_status);
         log_info("Child %d died with code %d", t->si_pid, t->si_status);

-       /* Wait for a dead child. */
-       waitpid(t->si_pid, NULL, 0);
+        /* Wait for a dead child. */
+        waitpid(t->si_pid, NULL, 0);

 }
 
 static int install_chld_handler(void) {
         int r;
 }
 
 static int install_chld_handler(void) {
         int r;

-       struct sigaction act;
+        struct sigaction act;

         zero(act);
         act.sa_flags = SA_SIGINFO;
         act.sa_sigaction = sigchld_hdl;
         zero(act);
         act.sa_flags = SA_SIGINFO;
         act.sa_sigaction = sigchld_hdl;


@@ -312,7 +314,8 @@ static int parse_argv(int argc, char *argv[]) {
                 { "version",      no_argument,       NULL, ARG_VERSION   },
                 { "listen",       required_argument, NULL, 'l'           },
                 { "accept",       no_argument,       NULL, 'a'           },
                 { "version",      no_argument,       NULL, ARG_VERSION   },
                 { "listen",       required_argument, NULL, 'l'           },
                 { "accept",       no_argument,       NULL, 'a'           },

-                { NULL,           0,                 NULL, 0             }
+                { "environment",  required_argument, NULL, 'E'           },
+                {}

         };
 
         int c;
         };
 
         int c;


@@ -320,11 +323,10 @@ static int parse_argv(int argc, char *argv[]) {
         assert(argc >= 0);
         assert(argv);
 
         assert(argc >= 0);
         assert(argv);
 

-        while ((c = getopt_long(argc, argv, "+hl:sa", options, NULL)) >= 0)
+        while ((c = getopt_long(argc, argv, "+hl:saE:", options, NULL)) >= 0)

                 switch(c) {
                 case 'h':
                 switch(c) {
                 case 'h':

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

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


@@ -343,12 +345,19 @@ static int parse_argv(int argc, char *argv[]) {
                         arg_accept = true;
                         break;
 
                         arg_accept = true;
                         break;
 

+                case 'E': {
+                        int r = strv_extend(&arg_environ, optarg);
+                        if (r < 0)
+                                return r;
+
+                        break;
+                }
+

                 case '?':
                         return -EINVAL;
 
                 default:
                 case '?':
                         return -EINVAL;
 
                 default:

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

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


@@ -366,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)


@@ -382,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);