X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=load-fragment.c;h=94bdf171af56782cfae35bedade867142807942a;hp=8bb29b2dcd3c2139c228ba18363604540890787a;hb=b08d03ffe58332f590aae5c78a85e4fc0b8588ce;hpb=acbb02252a38214ecba3aa8a5c9b3669f9c9317e diff --git a/load-fragment.c b/load-fragment.c index 8bb29b2dc..94bdf171a 100644 --- a/load-fragment.c +++ b/load-fragment.c @@ -35,19 +35,15 @@ static int config_parse_deps( FOREACH_WORD(w, &l, rvalue, state) { char *t; int r; - Unit *other; if (!(t = strndup(w, l))) return -ENOMEM; - r = manager_load_unit(u->meta.manager, t, &other); + r = unit_add_dependency_by_name(u, d, t); free(t); if (r < 0) return r; - - if ((r = unit_add_dependency(u, d, other)) < 0) - return r; } return 0; @@ -208,7 +204,8 @@ static int config_parse_nice( void *data, void *userdata) { - int *i = data, priority, r; + ExecContext *c = data; + int priority, r; assert(filename); assert(lvalue); @@ -225,7 +222,9 @@ static int config_parse_nice( return -ERANGE; } - *i = priority; + c->nice = priority; + c->nice_set = false; + return 0; } @@ -238,7 +237,8 @@ static int config_parse_oom_adjust( void *data, void *userdata) { - int *i = data, oa, r; + ExecContext *c = data; + int oa, r; assert(filename); assert(lvalue); @@ -255,7 +255,9 @@ static int config_parse_oom_adjust( return -ERANGE; } - *i = oa; + c->oom_adjust = oa; + c->oom_adjust_set = true; + return 0; } @@ -479,35 +481,152 @@ int config_parse_bindtodevice( return 0; } -#define FOLLOW_MAX 8 +int config_parse_output( + const char *filename, + unsigned line, + const char *section, + const char *lvalue, + const char *rvalue, + void *data, + void *userdata) { -static char *build_path(const char *path, const char *filename) { - char *e, *r; - size_t k; + ExecOutput *o = data; - assert(path); assert(filename); + assert(lvalue); + assert(rvalue); + assert(data); - /* This removes the last component of path and appends - * filename, unless the latter is absolute anyway or the - * former isn't */ + if (streq(rvalue, "syslog")) + *o = EXEC_SYSLOG; + else if (streq(rvalue, "null")) + *o = EXEC_NULL; + else if (streq(rvalue, "syslog")) + *o = EXEC_SYSLOG; + else if (streq(rvalue, "kernel")) + *o = EXEC_KERNEL; + else { + log_error("[%s:%u] Failed to parse log output: %s", filename, line, rvalue); + return -EBADMSG; + } - if (path_is_absolute(filename)) - return strdup(filename); + return 0; +} - if (!(e = strrchr(path, '/'))) - return strdup(filename); +int config_parse_facility( + const char *filename, + unsigned line, + const char *section, + const char *lvalue, + const char *rvalue, + void *data, + void *userdata) { - k = strlen(filename); - if (!(r = new(char, e-path+1+k+1))) - return NULL; + static const char * const table[LOG_NFACILITIES] = { + [LOG_FAC(LOG_KERN)] = "kern", + [LOG_FAC(LOG_USER)] = "user", + [LOG_FAC(LOG_MAIL)] = "mail", + [LOG_FAC(LOG_DAEMON)] = "daemon", + [LOG_FAC(LOG_AUTH)] = "auth", + [LOG_FAC(LOG_SYSLOG)] = "syslog", + [LOG_FAC(LOG_LPR)] = "lpr", + [LOG_FAC(LOG_NEWS)] = "news", + [LOG_FAC(LOG_UUCP)] = "uucp", + [LOG_FAC(LOG_CRON)] = "cron", + [LOG_FAC(LOG_AUTHPRIV)] = "authpriv", + [LOG_FAC(LOG_FTP)] = "ftp", + [LOG_FAC(LOG_LOCAL0)] = "local0", + [LOG_FAC(LOG_LOCAL1)] = "local1", + [LOG_FAC(LOG_LOCAL2)] = "local2", + [LOG_FAC(LOG_LOCAL3)] = "local3", + [LOG_FAC(LOG_LOCAL4)] = "local4", + [LOG_FAC(LOG_LOCAL5)] = "local5", + [LOG_FAC(LOG_LOCAL6)] = "local6", + [LOG_FAC(LOG_LOCAL7)] = "local7" + }; - memcpy(r, path, e-path+1); - memcpy(r+(e-path)+1, filename, k+1); + ExecOutput *o = data; + int i; - return r; + assert(filename); + assert(lvalue); + assert(rvalue); + assert(data); + + for (i = 0; i < (int) ELEMENTSOF(table); i++) + if (streq(rvalue, table[i])) { + *o = LOG_MAKEPRI(i, LOG_PRI(*o)); + break; + } + + if (i >= (int) ELEMENTSOF(table)) { + + /* Second try, let's see if this is a number. */ + if (safe_atoi(rvalue, &i) >= 0 && + i >= 0 && + i < (int) ELEMENTSOF(table)) + *o = LOG_MAKEPRI(i, LOG_PRI(*o)); + else { + log_error("[%s:%u] Failed to parse log output: %s", filename, line, rvalue); + return -EBADMSG; + } + } + + return 0; +} + +int config_parse_level( + const char *filename, + unsigned line, + const char *section, + const char *lvalue, + const char *rvalue, + void *data, + void *userdata) { + + static const char * const table[LOG_DEBUG+1] = { + [LOG_EMERG] = "emerg", + [LOG_ALERT] = "alert", + [LOG_CRIT] = "crit", + [LOG_ERR] = "err", + [LOG_WARNING] = "warning", + [LOG_NOTICE] = "notice", + [LOG_INFO] = "info", + [LOG_DEBUG] = "debug" + }; + + ExecOutput *o = data; + int i; + + assert(filename); + assert(lvalue); + assert(rvalue); + assert(data); + + for (i = 0; i < (int) ELEMENTSOF(table); i++) + if (streq(rvalue, table[i])) { + *o = LOG_MAKEPRI(LOG_FAC(*o), i); + break; + } + + if (i >= LOG_NFACILITIES) { + + /* Second try, let's see if this is a number. */ + if (safe_atoi(rvalue, &i) >= 0 && + i >= 0 && + i < (int) ELEMENTSOF(table)) + *o = LOG_MAKEPRI(LOG_FAC(*o), i); + else { + log_error("[%s:%u] Failed to parse log output: %s", filename, line, rvalue); + return -EBADMSG; + } + } + + return 0; } +#define FOLLOW_MAX 8 + static int open_follow(char **filename, FILE **_f, Set *names, char **_id) { unsigned c = 0; int fd, r; @@ -528,6 +647,8 @@ static int open_follow(char **filename, FILE **_f, Set *names, char **_id) { if (c++ >= FOLLOW_MAX) return -ELOOP; + path_kill_slashes(*filename); + /* Add the file name we are currently looking at to * the names of this unit */ name = file_name_from_path(*filename); @@ -553,7 +674,7 @@ static int open_follow(char **filename, FILE **_f, Set *names, char **_id) { if ((r = readlink_malloc(*filename, &target)) < 0) return r; - k = build_path(*filename, target); + k = file_in_same_dir(*filename, target); free(target); if (!k) @@ -592,10 +713,14 @@ static int load_from_path(Unit *u, const char *path) { { "User", config_parse_string, &(context).user, section }, \ { "Group", config_parse_string, &(context).group, section }, \ { "SupplementaryGroups", config_parse_strv, &(context).supplementary_groups, section }, \ - { "Nice", config_parse_nice, &(context).nice, section }, \ - { "OOMAdjust", config_parse_oom_adjust, &(context).oom_adjust, section }, \ + { "Nice", config_parse_nice, &(context), section }, \ + { "OOMAdjust", config_parse_oom_adjust, &(context), section }, \ { "UMask", config_parse_umask, &(context).umask, section }, \ - { "Environment", config_parse_strv, &(context).environment, section } + { "Environment", config_parse_strv, &(context).environment, section }, \ + { "Output", config_parse_output, &(context).output, section }, \ + { "SyslogIdentifier", config_parse_string, &(context).syslog_identifier, section }, \ + { "SyslogFacility", config_parse_facility, &(context).syslog_priority, section }, \ + { "SyslogLevel", config_parse_level, &(context).syslog_priority, section } const ConfigItem items[] = { { "Names", config_parse_names, u, "Meta" }, @@ -681,12 +806,12 @@ static int load_from_path(Unit *u, const char *path) { if ((r = unit_add_name(u, k)) < 0) goto finish; - if (id == k) - assert_se(u->meta.id = set_get(u->meta.names, k)); free(k); } + unit_choose_id(u, id); + free(u->meta.load_path); u->meta.load_path = filename; filename = NULL; @@ -703,7 +828,8 @@ finish: } int unit_load_fragment(Unit *u) { - int r = -ENOENT; + int r = 0; + ExecContext *c; assert(u); assert(u->meta.load_state == UNIT_STUB); @@ -720,5 +846,26 @@ int unit_load_fragment(Unit *u) { return r; } + if (u->meta.type == UNIT_SOCKET) + c = &u->socket.exec_context; + else if (u->meta.type == UNIT_SERVICE) + c = &u->service.exec_context; + else + c = NULL; + + if (r >= 0 && c && + (c->output == EXEC_KERNEL || c->output == EXEC_SYSLOG)) { + int k; + + /* If syslog or kernel logging is requested, make sure + * our own logging daemon is run first. */ + + if ((k = unit_add_dependency(u, UNIT_AFTER, u->meta.manager->special_units[SPECIAL_LOGGER_SOCKET])) < 0) + return k; + + if ((k = unit_add_dependency(u, UNIT_REQUIRES, u->meta.manager->special_units[SPECIAL_LOGGER_SOCKET])) < 0) + return k; + } + return r; }