fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-18 08:08:09 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

logging: allow logging control from the config file

Browse source
This commit is contained in:
Dan Williams 2010-04-06 15:57:24 -07:00
parent d03de42350
commit 3e8a05d28e
1 changed files with 23 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/main.c
View file

@ -299,6 +299,8 @@ static gboolean
parse_config_file (const char *filename,
char **plugins,
char **dhcp_client,
char **log_level,
char **log_domains,
GError **error)
{
GKeyFile *config;
@ -320,6 +322,9 @@ parse_config_file (const char *filename,
*dhcp_client = g_key_file_get_value (config, "main", "dhcp", NULL);
*log_level = g_key_file_get_value (config, "main", "log-level", NULL);
*log_domains = g_key_file_get_value (config, "main", "log-domains", NULL);
g_key_file_free (config);
return TRUE;
}
@ -446,6 +451,7 @@ main (int argc, char *argv[])
NMDHCPManager *dhcp_mgr = NULL;
GError *error = NULL;
gboolean wrote_pidfile = FALSE;
char *cfg_log_level = NULL, *cfg_log_domains = NULL;
GOptionEntry options[] = {
{ "no-daemon", 0, 0, G_OPTION_ARG_NONE, &become_daemon, "Don't become a daemon", NULL },
@ -493,14 +499,6 @@ main (int argc, char *argv[])
exit (1);
}
/* Logging setup */
if (!nm_logging_setup (log_level, log_domains, &error)) {
fprintf (stderr,
_("%s. Please use --help to see a list of valid options.\n"),
error->message);
exit (1);
}
pidfile = pidfile ? pidfile : g_strdup (NM_DEFAULT_PID_FILE);
state_file = state_file ? state_file : g_strdup (NM_DEFAULT_SYSTEM_STATE_FILE);
@ -510,7 +508,7 @@ main (int argc, char *argv[])
/* Parse the config file */
if (config) {
if (!parse_config_file (config, &conf_plugins, &dhcp, &error)) {
if (!parse_config_file (config, &conf_plugins, &dhcp, &cfg_log_level, &cfg_log_domains, &error)) {
fprintf (stderr, "Config file %s invalid: (%d) %s\n",
config,
error ? error->code : -1,
@ -523,7 +521,7 @@ main (int argc, char *argv[])
/* Try NetworkManager.conf first */
if (g_file_test (NM_DEFAULT_SYSTEM_CONF_FILE, G_FILE_TEST_EXISTS)) {
config = g_strdup (NM_DEFAULT_SYSTEM_CONF_FILE);
parsed = parse_config_file (config, &conf_plugins, &dhcp, &error);
parsed = parse_config_file (config, &conf_plugins, &dhcp, &cfg_log_level, &cfg_log_domains, &error);
if (!parsed) {
fprintf (stderr, "Default config file %s invalid: (%d) %s\n",
config,
@ -539,7 +537,7 @@ main (int argc, char *argv[])
/* Try old nm-system-settings.conf next */
if (!parsed) {
config = g_strdup (NM_OLD_SYSTEM_CONF_FILE);
if (!parse_config_file (config, &conf_plugins, &dhcp, &error)) {
if (!parse_config_file (config, &conf_plugins, &dhcp, &cfg_log_level, &cfg_log_domains, &error)) {
fprintf (stderr, "Default config file %s invalid: (%d) %s\n",
config,
error ? error->code : -1,
@ -552,6 +550,16 @@ main (int argc, char *argv[])
}
}
/* Logging setup */
if (!nm_logging_setup (log_level ? log_level : cfg_log_level,
log_domains ? log_domains : cfg_log_domains,
&error)) {
fprintf (stderr,
_("%s. Please use --help to see a list of valid options.\n"),
error->message);
exit (1);
}
/* Plugins specified with '--plugins' override those of config file */
plugins = plugins ? plugins : g_strdup (conf_plugins);
g_free (conf_plugins);
@ -722,6 +730,10 @@ done:
g_free (config);
g_free (plugins);
g_free (dhcp);
g_free (log_level);
g_free (log_domains);
g_free (cfg_log_level);
g_free (cfg_log_domains);
nm_log_info (LOGD_CORE, "exiting (%s)", success ? "success" : "error");
exit (success ? 0 : 1);