chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
journal: implement seek to head/tail
[elogind.git]
/
src
/
service.c
diff --git
a/src/service.c
b/src/service.c
index a40e01b88818b99978c11da68c8ba81a9fdfd422..e64d289fede715dd13b1829c5a9fcd963c725e64 100644
(file)
--- a/
src/service.c
+++ b/
src/service.c
@@
-829,6
+829,7
@@
static int service_load_sysv_path(Service *s, const char *path) {
/* Special setting for all SysV services */
s->type = SERVICE_FORKING;
s->remain_after_exit = !s->pid_file;
/* Special setting for all SysV services */
s->type = SERVICE_FORKING;
s->remain_after_exit = !s->pid_file;
+ s->guess_main_pid = false;
s->restart = SERVICE_RESTART_NO;
if (s->meta.manager->sysv_console)
s->restart = SERVICE_RESTART_NO;
if (s->meta.manager->sysv_console)
@@
-1145,6
+1146,8
@@
static int service_load(Unit *u) {
/* This is a new unit? Then let's add in some extras */
if (u->meta.load_state == UNIT_LOADED) {
/* This is a new unit? Then let's add in some extras */
if (u->meta.load_state == UNIT_LOADED) {
+ service_fix_output(s);
+
if ((r = unit_add_exec_dependencies(u, &s->exec_context)) < 0)
return r;
if ((r = unit_add_exec_dependencies(u, &s->exec_context)) < 0)
return r;
@@
-1173,8
+1176,6
@@
static int service_load(Unit *u) {
if (s->meta.default_dependencies)
if ((r = service_add_default_dependencies(s)) < 0)
return r;
if (s->meta.default_dependencies)
if ((r = service_add_default_dependencies(s)) < 0)
return r;
-
- service_fix_output(s);
}
return service_verify(s);
}
return service_verify(s);
@@
-1281,7
+1282,7
@@
static void service_dump(Unit *u, FILE *f, const char *prefix) {
free(p2);
}
free(p2);
}
-static int service_load_pid_file(Service *s) {
+static int service_load_pid_file(Service *s
, bool warn_if_missing
) {
char *k;
int r;
pid_t pid;
char *k;
int r;
pid_t pid;
@@
-1291,8
+1292,12
@@
static int service_load_pid_file(Service *s) {
if (!s->pid_file)
return -ENOENT;
if (!s->pid_file)
return -ENOENT;
- if ((r = read_one_line_file(s->pid_file, &k)) < 0)
+ if ((r = read_one_line_file(s->pid_file, &k)) < 0) {
+ if (warn_if_missing)
+ log_warning("Failed to read PID file %s after %s. The service might be broken.",
+ s->pid_file, service_state_to_string(s->state));
return r;
return r;
+ }
r = parse_pid(k, &pid);
free(k);
r = parse_pid(k, &pid);
free(k);
@@
-2604,7
+2609,7
@@
static void service_sigchld_event(Unit *u, pid_t pid, int code, int status) {
/* Forking services may occasionally move to a new PID.
* As long as they update the PID file before exiting the old
* PID, they're fine. */
/* Forking services may occasionally move to a new PID.
* As long as they update the PID file before exiting the old
* PID, they're fine. */
- if (service_load_pid_file(s) == 0)
+ if (service_load_pid_file(s
, false
) == 0)
return;
s->main_pid = 0;
return;
s->main_pid = 0;
@@
-2736,7
+2741,7
@@
static void service_sigchld_event(Unit *u, pid_t pid, int code, int status) {
* START_POST script */
if (success) {
* START_POST script */
if (success) {
- service_load_pid_file(s);
+ service_load_pid_file(s
, !s->exec_command[SERVICE_EXEC_START_POST]
);
service_search_main_pid(s);
service_enter_start_post(s);
service_search_main_pid(s);
service_enter_start_post(s);
@@
-2747,7
+2752,7
@@
static void service_sigchld_event(Unit *u, pid_t pid, int code, int status) {
case SERVICE_START_POST:
if (success) {
case SERVICE_START_POST:
if (success) {
- service_load_pid_file(s);
+ service_load_pid_file(s
, true
);
service_search_main_pid(s);
}
service_search_main_pid(s);
}
@@
-2757,7
+2762,7
@@
static void service_sigchld_event(Unit *u, pid_t pid, int code, int status) {
case SERVICE_RELOAD:
if (success) {
case SERVICE_RELOAD:
if (success) {
- service_load_pid_file(s);
+ service_load_pid_file(s
, true
);
service_search_main_pid(s);
}
service_search_main_pid(s);
}
@@
-3111,7
+3116,7
@@
static int service_enumerate(Manager *m) {
free(fpath);
fpath = join(path, "/", de->d_name, NULL);
free(fpath);
fpath = join(path, "/", de->d_name, NULL);
- if (!path) {
+ if (!
f
path) {
r = -ENOMEM;
goto finish;
}
r = -ENOMEM;
goto finish;
}