Просмотр исходного кода

ncd: modules/daemon: Fix the "daemon crashed" log message to include module context.

Ambroz Bizjak 11 лет назад
Родитель
Сommit
79524cb96c
3 измененных файлов с 4 добавлено и 4 удалено
  1. 2 2
      ncd/modules/daemon.c
  2. 1 1
      ncd/modules/runonce.c
  3. 1 1
      ncd/modules/sys_start_process.c

+ 2 - 2
ncd/modules/daemon.c

@@ -41,7 +41,7 @@
  *     the zeroth argument).
  *     the zeroth argument).
  *   options - Map of options:
  *   options - Map of options:
  *     "keep_stdout":"true" - Start the program with the same stdout as the NCD process.
  *     "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
  *     "do_setsid":"true" - Call setsid() in the child before exec. This is needed to
  *       start the 'agetty' program.
  *       start the 'agetty' program.
  *     "username":username_string - Start the process under the permissions of the
  *     "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;
         return;
     }
     }
     
     
-    BLog(BLOG_ERROR, "daemon crashed");
+    ModuleLog(o->i, BLOG_ERROR, "daemon crashed");
     
     
     // start timer
     // start timer
     BReactor_SetTimer(o->i->params->iparams->reactor, &o->timer);
     BReactor_SetTimer(o->i->params->iparams->reactor, &o->timer);

+ 1 - 1
ncd/modules/runonce.c

@@ -41,7 +41,7 @@
  *     "term_on_deinit":"true" - If we get a deinit request while the process is
  *     "term_on_deinit":"true" - If we get a deinit request while the process is
  *       running, send it SIGTERM.
  *       running, send it SIGTERM.
  *     "keep_stdout":"true" - Start the program with the same stdout as the NCD process.
  *     "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
  *     "do_setsid":"true" - Call setsid() in the child before exec. This is needed to
  *       start the 'agetty' program.
  *       start the 'agetty' program.
  *     "username":username_string - Start the process under the permissions of the
  *     "username":username_string - Start the process under the permissions of the

+ 1 - 1
ncd/modules/sys_start_process.c

@@ -34,7 +34,7 @@
  * Options:
  * Options:
  *   "keep_stdout":"true" - Start the program with the same stdout as the NCD process.
  *   "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.
  *     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
  *   "do_setsid":"true" - Call setsid() in the child before exec. This is needed to
  *     start the 'agetty' program.
  *     start the 'agetty' program.
  *   "username":username_string - Start the process under the permissions of the
  *   "username":username_string - Start the process under the permissions of the