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

ifupdown: use new logging API

Browse source
This commit is contained in:
Daniel Trebbien 2011-03-05 00:02:43 -06:00 • committed by Dan Williams
parent 77eeb95233
commit 96044f7d94
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/settings/plugins/ifupdown/Makefile.am
View file

@ -1,6 +1,7 @@
SUBDIRS=. tests
INCLUDES = \
-I$(top_srcdir)/src/logging \
-I$(top_srcdir)/src/settings \
-I$(top_srcdir)/include \
-I$(top_srcdir)/libnm-glib \
@ -44,6 +45,7 @@ libnm_settings_plugin_ifupdown_la_CPPFLAGS = \
libnm_settings_plugin_ifupdown_la_LDFLAGS = -module -avoid-version
libnm_settings_plugin_ifupdown_la_LIBADD = \
$(top_builddir)/libnm-util/libnm-util.la \
$(top_builddir)/src/logging/libnm-logging.la \
libifupdown-io.la \
$(GLIB_LIBS) \
$(GMODULE_LIBS) \

10
src/settings/plugins/ifupdown/plugin.c
View file

@ -48,7 +48,7 @@
#include "parser.h"
#include "nm-inotify-helper.h"
#include <nm-utils.h>
#include "nm-logging.h"
#include <arpa/inet.h>
@ -460,7 +460,7 @@ SCPluginIfupdown_init (NMSystemConfigInterface *config)
priv->conf_file,
G_KEY_FILE_NONE,
&error)) {
nm_info ("loading system config file (%s) caused error: (%d) %s",
nm_log_info (LOGD_SETTINGS, "loading system config file (%s) caused error: (%d) %s",
priv->conf_file,
error ? error->code : -1,
error && error->message ? error->message : "(unknown)");
@ -473,7 +473,7 @@ SCPluginIfupdown_init (NMSystemConfigInterface *config)
IFUPDOWN_KEY_FILE_KEY_MANAGED,
&error);
if (error) {
nm_info ("getting keyfile key '%s' in group '%s' failed: (%d) %s",
nm_log_info (LOGD_SETTINGS, "getting keyfile key '%s' in group '%s' failed: (%d) %s",
IFUPDOWN_KEY_FILE_GROUP,
IFUPDOWN_KEY_FILE_KEY_MANAGED,
error ? error->code : -1,
@ -595,7 +595,7 @@ update_system_hostname(NMInotifyHelper *inotify_helper,
&hostname_file,
&hostname_file_len,
&error)) {
nm_warning ("update_system_hostname() - couldn't read "
nm_log_warn (LOGD_SETTINGS, "update_system_hostname() - couldn't read "
IFUPDOWN_SYSTEM_HOSTNAME_FILE " (%d/%s)",
error->code, error->message);
return;
@ -629,7 +629,7 @@ write_system_hostname(NMSystemConfigInterface *config,
newhostname,
-1,
&error)) {
nm_warning ("update_system_hostname() - couldn't write hostname (%s) to "
nm_log_warn (LOGD_SETTINGS, "update_system_hostname() - couldn't write hostname (%s) to "
IFUPDOWN_SYSTEM_HOSTNAME_FILE " (%d/%s)",
newhostname, error->code, error->message);
} else {