diff options
Diffstat (limited to 'src/progman.c')
| -rw-r--r-- | src/progman.c | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/src/progman.c b/src/progman.c index f68fe91..547f806 100644 --- a/src/progman.c +++ b/src/progman.c @@ -1005,8 +1005,7 @@ prog_start_prologue (struct prog *prog) logmsg_printf (LOG_DEBUG, "executing"); for (i = 0; i < comp->argc; i++) - logmsg_printf (LOG_DEBUG, " %s", - quotearg (comp->argv[i])); + logmsg_printf (LOG_DEBUG, " %s", quotearg (comp->argv[i])); logmsg_printf (LOG_DEBUG, "\n"); } } @@ -1091,9 +1090,7 @@ prog_start (struct prog *prog) debug (1, (_("unlinking %s"), prog->v.p.comp->pass_fd_socket)); if (unlink (prog->v.p.comp->pass_fd_socket) && errno != ENOENT) { - logmsg (LOG_ERR, _("cannot unlink %s: %s"), - prog->v.p.comp->pass_fd_socket, - strerror (errno)); + logfuncall ("unlink", prog->v.p.comp->pass_fd_socket, errno); return; } if (prog_open_socket (prog)) @@ -1324,7 +1321,7 @@ _prog_accept (struct prog *p) fd = accept (p->v.p.socket, (struct sockaddr*) &addr, &addrlen); if (fd == -1) { - logmsg (LOG_ERR, _("accept failed: %s"), strerror (errno)); + logfuncall ("accept", NULL, errno); return 1; } @@ -1848,7 +1845,7 @@ propagate_child_exit (pid_t pid) while (waitpid (pid, &wait_status, 0) == -1) if (errno != EINTR) { - logmsg (LOG_ERR, _("waitpid failed: %s"), strerror (errno)); + logfuncall ("waitpid", NULL, errno); exit (EX_OSERR); } @@ -2402,7 +2399,7 @@ progman_stop_component (struct prog **progptr) switch (prog->v.p.status) { case status_running: - logmsg (LOG_INFO, _("stopping component `%s'"), prog_tag (prog)); + logmsg (LOG_INFO, _("stopping component %s"), prog_tag (prog)); prog_stop (prog, SIGTERM); break; @@ -2422,7 +2419,7 @@ progman_stop_component (struct prog **progptr) prog->v.p.stop = 0; else { - logmsg (LOG_INFO, _("waking up component `%s'"), prog_tag (prog)); + logmsg (LOG_INFO, _("waking up component %s"), prog_tag (prog)); prog->v.p.failcount = 0; } break; @@ -2436,7 +2433,7 @@ progman_stop_component (struct prog **progptr) destroy_prog (progptr); else logmsg (LOG_INFO, - _("stopping component `%s': component not started"), + _("stopping component %s: component not started"), prog_tag (prog)); } } @@ -2445,7 +2442,7 @@ progman_stop_component (struct prog **progptr) void prog_deactivate_listener (struct prog *prog) { - logmsg (LOG_INFO, _("deactivating listener `%s'"), prog_tag (prog)); + logmsg (LOG_INFO, _("deactivating listener %s"), prog_tag (prog)); if (prog->v.p.socket != -1) { deregister_socket (prog->v.p.socket); @@ -2458,7 +2455,7 @@ prog_activate_listener (struct prog *prog) { struct component *comp = prog->v.p.comp; - logmsg (LOG_INFO, _("activating listener `%s'"), prog_tag (prog)); + logmsg (LOG_INFO, _("activating listener %s"), prog_tag (prog)); if (comp->mode == pies_comp_inetd && !ISCF_TCPMUX (comp->flags) && prog->v.p.socket == -1) { |