/* have to remove SIGABRT to avoid recursive - os_exit calling abort() */
unsetup_signal_handlers (SIGABRT);
- /* os_exit(1) causes core generation, do not do this for SIGINT */
- if (signum == SIGINT)
+ /* os_exit(1) causes core generation, skip that for SIGINT, SIGHUP */
+ if (signum == SIGINT || signum == SIGHUP)
os_exit (0);
else
os_exit (1);
case SIGSTOP:
case SIGUSR1:
case SIGUSR2:
+ case SIGPROF:
continue;
/* ignore SIGPIPE, SIGCHLD */
{
unix_main_t *um = arg;
- /* Echo to stderr when interactive. */
- if (um->flags & UNIX_FLAG_INTERACTIVE)
+ /* Echo to stderr when interactive or syslog is disabled. */
+ if (um->flags & (UNIX_FLAG_INTERACTIVE | UNIX_FLAG_NOSYSLOG))
{
CLIB_UNUSED (int r) = write (2, msg, msg_len);
}
um->flags |= UNIX_FLAG_INTERACTIVE;
else if (unformat (input, "nodaemon"))
um->flags |= UNIX_FLAG_NODAEMON;
+ else if (unformat (input, "nosyslog"))
+ um->flags |= UNIX_FLAG_NOSYSLOG;
else if (unformat (input, "cli-prompt %s", &cli_prompt))
vlib_unix_cli_set_prompt (cli_prompt);
else
}
}
- if (!(um->flags & UNIX_FLAG_INTERACTIVE))
+ if (!(um->flags & (UNIX_FLAG_INTERACTIVE | UNIX_FLAG_NOSYSLOG)))
{
openlog (vm->name, LOG_CONS | LOG_PERROR | LOG_PID, LOG_DAEMON);
clib_error_register_handler (unix_error_handler, um);
* Do not fork or background the VPP process. Typically used when invoking
* VPP applications from a process monitor.
*
+ * @cfgcmd{nosyslog}
+ * Do not send e.g. clib_warning(...) output to syslog. Used
+ * when invoking VPP applications from a process monitor which
+ * pipe stdout/stderr to a dedicated logger service.
+ *
* @cfgcmd{exec, <filename>}
* @par <code>startup-config <filename></code>
* Read startup operational configuration from @c filename.
unformat_input_t input;
int i;
+ vlib_process_finish_switch_stack (vm);
+
unformat_init_command_line (&input, (char **) vm->argv);
i = vlib_main (vm, &input);
unformat_free (&input);
(((uword) vm->heap_base) & ~(VLIB_FRAME_ALIGN - 1));
ASSERT (vm->heap_base);
+ clib_time_init (&vm->clib_time);
+
unformat_init_command_line (&input, (char **) vm->argv);
if ((e = vlib_plugin_config (vm, &input)))
{
__os_thread_index = 0;
vm->thread_index = 0;
+ vlib_process_start_switch_stack (vm, 0);
i = clib_calljmp (thread0, (uword) vm,
(void *) (vlib_thread_stacks[0] +
VLIB_THREAD_STACK_SIZE));