conf, passt: Don't call __openlog() if a log file is used
If a log file is configured, we would otherwise open a connection to the system logger (if any), print any message that we might have before we initialise the log file, and then keep that connection around for no particular reason. Call __openlog() as an alternative to the log file setup, instead. This way, we might skip printing some messages during the initialisation phase, but they're probably not really valuable to have in a system log, and we're going to print them to standard error anyway. Suggested-by: David Gibson <david@gibson.dropbear.id.au> Signed-off-by: Stefano Brivio <sbrivio@redhat.com> Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
parent
dba7f0f5ce
commit
e7323e515a
2 changed files with 5 additions and 8 deletions
9
conf.c
9
conf.c
|
@ -1217,6 +1217,7 @@ void conf(struct ctx *c, int argc, char **argv)
|
||||||
{"netns-only", no_argument, NULL, 20 },
|
{"netns-only", no_argument, NULL, 20 },
|
||||||
{ 0 },
|
{ 0 },
|
||||||
};
|
};
|
||||||
|
const char *logname = (c->mode == MODE_PASTA) ? "pasta" : "passt";
|
||||||
char userns[PATH_MAX] = { 0 }, netns[PATH_MAX] = { 0 };
|
char userns[PATH_MAX] = { 0 }, netns[PATH_MAX] = { 0 };
|
||||||
bool copy_addrs_opt = false, copy_routes_opt = false;
|
bool copy_addrs_opt = false, copy_routes_opt = false;
|
||||||
struct in6_addr *dns6 = c->ip6.dns, dns6_tmp;
|
struct in6_addr *dns6 = c->ip6.dns, dns6_tmp;
|
||||||
|
@ -1619,10 +1620,10 @@ void conf(struct ctx *c, int argc, char **argv)
|
||||||
|
|
||||||
conf_ugid(runas, &uid, &gid);
|
conf_ugid(runas, &uid, &gid);
|
||||||
|
|
||||||
if (logfile) {
|
if (logfile)
|
||||||
logfile_init(c->mode == MODE_PASTA ? "pasta" : "passt",
|
logfile_init(logname, logfile, logsize);
|
||||||
logfile, logsize);
|
else
|
||||||
}
|
__openlog(logname, 0, LOG_DAEMON);
|
||||||
|
|
||||||
if (c->debug)
|
if (c->debug)
|
||||||
__setlogmask(LOG_UPTO(LOG_DEBUG));
|
__setlogmask(LOG_UPTO(LOG_DEBUG));
|
||||||
|
|
4
passt.c
4
passt.c
|
@ -224,8 +224,6 @@ int main(int argc, char **argv)
|
||||||
strncpy(argv0, argv[0], PATH_MAX - 1);
|
strncpy(argv0, argv[0], PATH_MAX - 1);
|
||||||
name = basename(argv0);
|
name = basename(argv0);
|
||||||
if (strstr(name, "pasta")) {
|
if (strstr(name, "pasta")) {
|
||||||
__openlog("pasta", 0, LOG_DAEMON);
|
|
||||||
|
|
||||||
sa.sa_handler = pasta_child_handler;
|
sa.sa_handler = pasta_child_handler;
|
||||||
if (sigaction(SIGCHLD, &sa, NULL))
|
if (sigaction(SIGCHLD, &sa, NULL))
|
||||||
die_perror("Couldn't install signal handlers");
|
die_perror("Couldn't install signal handlers");
|
||||||
|
@ -235,8 +233,6 @@ int main(int argc, char **argv)
|
||||||
|
|
||||||
c.mode = MODE_PASTA;
|
c.mode = MODE_PASTA;
|
||||||
} else if (strstr(name, "passt")) {
|
} else if (strstr(name, "passt")) {
|
||||||
__openlog("passt", 0, LOG_DAEMON);
|
|
||||||
|
|
||||||
c.mode = MODE_PASST;
|
c.mode = MODE_PASST;
|
||||||
} else {
|
} else {
|
||||||
exit(EXIT_FAILURE);
|
exit(EXIT_FAILURE);
|
||||||
|
|
Loading…
Reference in a new issue