Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/ambrop72/badvpn.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAmbroz Bizjak <ambrop7@gmail.com>2015-03-01 13:23:57 +0300
committerAmbroz Bizjak <ambrop7@gmail.com>2015-03-01 13:24:58 +0300
commit79524cb96c4d5e51700285b4806e211b9300dd2e (patch)
tree0c29c9b497416e4873583637dc2a04235371d904
parent32c85dc7f740e405981ba81422ec7cb49717ccac (diff)
ncd: modules/daemon: Fix the "daemon crashed" log message to include module context.
-rw-r--r--ncd/modules/daemon.c4
-rw-r--r--ncd/modules/runonce.c2
-rw-r--r--ncd/modules/sys_start_process.c2
3 files changed, 4 insertions, 4 deletions
diff --git a/ncd/modules/daemon.c b/ncd/modules/daemon.c
index fd07fdd..ca4ee56 100644
--- a/ncd/modules/daemon.c
+++ b/ncd/modules/daemon.c
@@ -41,7 +41,7 @@
* the zeroth argument).
* options - Map of options:
* "keep_stdout":"true" - Start the program with the same stdout as the NCD process.
- * "keep_stderr":true" - Start the program with the same stderr as the NCD process.
+ * "keep_stderr":"true" - Start the program with the same stderr as the NCD process.
* "do_setsid":"true" - Call setsid() in the child before exec. This is needed to
* start the 'agetty' program.
* "username":username_string - Start the process under the permissions of the
@@ -205,7 +205,7 @@ static void process_handler (struct instance *o, int normally, uint8_t normally_
return;
}
- BLog(BLOG_ERROR, "daemon crashed");
+ ModuleLog(o->i, BLOG_ERROR, "daemon crashed");
// start timer
BReactor_SetTimer(o->i->params->iparams->reactor, &o->timer);
diff --git a/ncd/modules/runonce.c b/ncd/modules/runonce.c
index 1c6ffc7..6db31e9 100644
--- a/ncd/modules/runonce.c
+++ b/ncd/modules/runonce.c
@@ -41,7 +41,7 @@
* "term_on_deinit":"true" - If we get a deinit request while the process is
* running, send it SIGTERM.
* "keep_stdout":"true" - Start the program with the same stdout as the NCD process.
- * "keep_stderr":true" - Start the program with the same stderr as the NCD process.
+ * "keep_stderr":"true" - Start the program with the same stderr as the NCD process.
* "do_setsid":"true" - Call setsid() in the child before exec. This is needed to
* start the 'agetty' program.
* "username":username_string - Start the process under the permissions of the
diff --git a/ncd/modules/sys_start_process.c b/ncd/modules/sys_start_process.c
index 911eb59..91bc790 100644
--- a/ncd/modules/sys_start_process.c
+++ b/ncd/modules/sys_start_process.c
@@ -34,7 +34,7 @@
* Options:
* "keep_stdout":"true" - Start the program with the same stdout as the NCD process.
* Must not be present if the process is being opened for reading.
- * "keep_stderr":true" - Start the program with the same stderr as the NCD process.
+ * "keep_stderr":"true" - Start the program with the same stderr as the NCD process.
* "do_setsid":"true" - Call setsid() in the child before exec. This is needed to
* start the 'agetty' program.
* "username":username_string - Start the process under the permissions of the