From 6021761081145a5cbdd7812044f094a3e04f1d64 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Wed, 7 Apr 2010 10:13:44 -0700 Subject: [PATCH] backends: update logging --- src/backends/Makefile.am | 20 +++++++++++++------- src/backends/NetworkManagerDebian.c | 4 ++-- src/backends/NetworkManagerGeneric.c | 8 +++++--- src/backends/NetworkManagerGentoo.c | 4 ++-- src/backends/NetworkManagerPaldo.c | 4 ++-- src/backends/NetworkManagerSuSE.c | 4 ++-- 6 files changed, 26 insertions(+), 18 deletions(-) diff --git a/src/backends/Makefile.am b/src/backends/Makefile.am index 0e037c41d1..c3485e5f9b 100644 --- a/src/backends/Makefile.am +++ b/src/backends/Makefile.am @@ -1,9 +1,11 @@ -INCLUDES = -I${top_srcdir} \ - -I${top_srcdir}/include \ - -I${top_srcdir}/src \ - -I${top_srcdir}/src/vpn-manager \ - -I${top_srcdir}/src/named-manager \ - -I${top_srcdir}/libnm-util +INCLUDES = \ + -I${top_srcdir} \ + -I${top_srcdir}/src/logging \ + -I${top_srcdir}/include \ + -I${top_srcdir}/src \ + -I${top_srcdir}/src/vpn-manager \ + -I${top_srcdir}/src/named-manager \ + -I${top_srcdir}/libnm-util noinst_LTLIBRARIES = libnmbackend.la @@ -53,7 +55,11 @@ if TARGET_PARDUS libnmbackend_la_SOURCES += NetworkManagerPardus.c endif -libnmbackend_la_LIBADD += $(DBUS_LIBS) $(GLIB_LIBS) +libnmbackend_la_LIBADD += \ + $(top_builddir)/src/logging/libnm-logging.la \ + $(DBUS_LIBS) \ + $(GLIB_LIBS) + libnmbackend_la_CPPFLAGS = \ $(DBUS_CFLAGS) \ $(GLIB_CFLAGS) \ diff --git a/src/backends/NetworkManagerDebian.c b/src/backends/NetworkManagerDebian.c index cba1363f3a..ef9475af6d 100644 --- a/src/backends/NetworkManagerDebian.c +++ b/src/backends/NetworkManagerDebian.c @@ -34,7 +34,7 @@ #include "NetworkManagerGeneric.h" #include "nm-system.h" #include "NetworkManagerUtils.h" -#include "nm-utils.h" +#include "nm-logging.h" /* * nm_system_enable_loopback @@ -57,7 +57,7 @@ void nm_system_enable_loopback (void) void nm_system_update_dns (void) { if (g_file_test ("/usr/sbin/nscd", G_FILE_TEST_IS_EXECUTABLE)) { - nm_info ("Clearing nscd hosts cache."); + nm_log_info (LOGD_DNS, "Clearing nscd hosts cache."); nm_spawn_process ("/usr/sbin/nscd -i hosts"); } } diff --git a/src/backends/NetworkManagerGeneric.c b/src/backends/NetworkManagerGeneric.c index 26076fa678..4f8336d9bb 100644 --- a/src/backends/NetworkManagerGeneric.c +++ b/src/backends/NetworkManagerGeneric.c @@ -1,3 +1,4 @@ +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */ /* NetworkManager -- Network link manager * * Timothee Lecomte @@ -36,7 +37,7 @@ #include "nm-system.h" #include "NetworkManagerUtils.h" #include "nm-netlink.h" -#include "nm-utils.h" +#include "nm-logging.h" /* Because of a bug in libnl, rtnl.h should be included before route.h */ #include @@ -93,8 +94,9 @@ void nm_generic_enable_loopback (void) rtnl_addr_set_label (addr, "lo"); if ((err = rtnl_addr_add (nlh, addr, 0)) < 0) { - if (err != -EEXIST) - nm_warning ("error %d returned from rtnl_addr_add():\n%s", err, nl_geterror()); + if (err != -EEXIST) { + nm_log_warn (LOGD_CORE, "error %d returned from rtnl_addr_add():\n%s", err, nl_geterror()); + } } out: if (addr) diff --git a/src/backends/NetworkManagerGentoo.c b/src/backends/NetworkManagerGentoo.c index 8616941f1a..8d9e68c59c 100644 --- a/src/backends/NetworkManagerGentoo.c +++ b/src/backends/NetworkManagerGentoo.c @@ -34,7 +34,7 @@ #include "NetworkManagerGeneric.h" #include "nm-system.h" #include "NetworkManagerUtils.h" -#include "nm-utils.h" +#include "nm-logging.h" /* * nm_system_enable_loopback @@ -59,7 +59,7 @@ void nm_system_enable_loopback (void) void nm_system_update_dns (void) { if (g_file_test ("/usr/sbin/nscd", G_FILE_TEST_IS_EXECUTABLE)) { - nm_info ("Clearing nscd hosts cache."); + nm_log_info (LOGD_DNS, "Clearing nscd hosts cache."); nm_spawn_process ("/usr/sbin/nscd -i hosts"); } } diff --git a/src/backends/NetworkManagerPaldo.c b/src/backends/NetworkManagerPaldo.c index 777d4e23e1..0c67e5bdf6 100644 --- a/src/backends/NetworkManagerPaldo.c +++ b/src/backends/NetworkManagerPaldo.c @@ -33,7 +33,7 @@ #include "NetworkManagerGeneric.h" #include "nm-system.h" #include "NetworkManagerUtils.h" -#include "nm-utils.h" +#include "nm-logging.h" /* * nm_system_enable_loopback @@ -55,7 +55,7 @@ void nm_system_enable_loopback (void) */ void nm_system_update_dns (void) { - nm_info ("Clearing nscd hosts cache."); + nm_log_info (LOGD_DNS, "Clearing nscd hosts cache."); nm_spawn_process ("/usr/sbin/nscd -i hosts"); } diff --git a/src/backends/NetworkManagerSuSE.c b/src/backends/NetworkManagerSuSE.c index ef4ff15b37..6c8ec1a5d6 100644 --- a/src/backends/NetworkManagerSuSE.c +++ b/src/backends/NetworkManagerSuSE.c @@ -34,7 +34,7 @@ #include "NetworkManagerGeneric.h" #include "nm-system.h" #include "NetworkManagerUtils.h" -#include "nm-utils.h" +#include "nm-logging.h" /* * nm_system_enable_loopback @@ -56,7 +56,7 @@ void nm_system_enable_loopback (void) */ void nm_system_update_dns (void) { - nm_info ("Clearing nscd hosts cache."); + nm_log_info (LOGD_DNS, "Clearing nscd hosts cache."); nm_spawn_process ("/usr/sbin/nscd -i hosts"); }