------------------------------------------------------------
revno: 1637
committer: James Hunt <james.h...@ubuntu.com>
branch nick: upstart
timestamp: Thu 2014-06-12 15:23:47 +0100
message:
* Formatting.
modified:
init/job.c
--
lp:upstart
https://code.launchpad.net/~upstart-devel/upstart/trunk
Your team Upstart Reviewers is subscribed to branch lp:upstart.
To unsubscribe from this branch go to
https://code.launchpad.net/~upstart-devel/upstart/trunk/+edit-subscription
=== modified file 'init/job.c'
--- init/job.c 2014-06-09 08:40:06 +0000
+++ init/job.c 2014-06-12 14:23:47 +0000
@@ -483,9 +483,11 @@
case JOB_PRE_STARTING:
nih_assert (job->goal == JOB_START);
nih_assert (old_state == JOB_SECURITY);
+
/* spawn pre-start asynchronously, child
* watcher asynchronously will change goal to
- * stop if spawning fails */
+ * stop if spawning fails.
+ */
if (job->class->process[PROCESS_PRE_START]) {
job_process_start (job, PROCESS_PRE_START);
}
@@ -513,9 +515,11 @@
case JOB_SPAWNED:
nih_assert (job->goal == JOB_START);
nih_assert (old_state == JOB_SPAWNING);
+
if (! job->class->process[PROCESS_MAIN]) {
state = job_next_state (job);
}
+
break;
case JOB_POST_STARTING:
nih_assert (job->goal == JOB_START);
@@ -591,6 +595,7 @@
break;
case JOB_KILLED:
nih_assert (old_state == JOB_STOPPING);
+
if (job->class->process[PROCESS_MAIN]
&& (job->pid[PROCESS_MAIN] > 0)) {
job_process_kill (job, PROCESS_MAIN);
--
upstart-devel mailing list
upstart-devel@lists.ubuntu.com
Modify settings or unsubscribe at:
https://lists.ubuntu.com/mailman/listinfo/upstart-devel
