From 894936ce9ed3fffd42bfb4939535ae421ea12c3a Mon Sep 17 00:00:00 2001 From: Tobias Brunner Date: Wed, 31 Mar 2010 17:39:02 +0200 Subject: [PATCH] Replaced some DBG_LIB with more specific groups. --- src/libhydra/attributes/attribute_manager.c | 6 +++--- src/libhydra/attributes/mem_pool.c | 16 ++++++++-------- src/libhydra/plugins/attr/attr_provider.c | 4 ++-- src/libhydra/plugins/attr_sql/attr_sql_plugin.c | 4 ++-- src/libhydra/plugins/attr_sql/sql_attribute.c | 6 +++--- src/pluto/plutomain.c | 2 +- 6 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/libhydra/attributes/attribute_manager.c b/src/libhydra/attributes/attribute_manager.c index 980f475..3080b56 100644 --- a/src/libhydra/attributes/attribute_manager.c +++ b/src/libhydra/attributes/attribute_manager.c @@ -83,7 +83,7 @@ static host_t* acquire_address(private_attribute_manager_t *this, if (!host) { - DBG1(DBG_LIB, "acquiring address from pool '%s' failed", pool); + DBG1(DBG_CFG, "acquiring address from pool '%s' failed", pool); } return host; } @@ -113,7 +113,7 @@ static void release_address(private_attribute_manager_t *this, if (!found) { - DBG1(DBG_LIB, "releasing address to pool '%s' failed", pool); + DBG1(DBG_CFG, "releasing address to pool '%s' failed", pool); } } @@ -206,7 +206,7 @@ static attribute_handler_t* handle(private_attribute_manager_t *this, if (!handled) { - DBG1(DBG_LIB, "handling %N attribute failed", + DBG1(DBG_CFG, "handling %N attribute failed", configuration_attribute_type_names, type); } return handled; diff --git a/src/libhydra/attributes/mem_pool.c b/src/libhydra/attributes/mem_pool.c index 569875c..65018e3 100644 --- a/src/libhydra/attributes/mem_pool.c +++ b/src/libhydra/attributes/mem_pool.c @@ -203,7 +203,7 @@ METHOD(mem_pool_t, acquire_address, host_t*, requested->get_family(requested) != this->base->get_family(this->base)) { - DBG1(DBG_LIB, "IP pool address family mismatch"); + DBG1(DBG_CFG, "IP pool address family mismatch"); return NULL; } @@ -217,7 +217,7 @@ METHOD(mem_pool_t, acquire_address, host_t*, id = this->ids->get(this->ids, id); if (id) { - DBG1(DBG_LIB, "reassigning offline lease to '%Y'", id); + DBG1(DBG_CFG, "reassigning offline lease to '%Y'", id); this->online->put(this->online, id, (void*)offset); break; } @@ -227,7 +227,7 @@ METHOD(mem_pool_t, acquire_address, host_t*, offset = (uintptr_t)this->online->get(this->online, id); if (offset && offset == host2offset(this, requested)) { - DBG1(DBG_LIB, "reassigning online lease to '%Y'", id); + DBG1(DBG_CFG, "reassigning online lease to '%Y'", id); break; } @@ -239,7 +239,7 @@ METHOD(mem_pool_t, acquire_address, host_t*, id = id->clone(id); this->ids->put(this->ids, id, id); this->online->put(this->online, id, (void*)offset); - DBG1(DBG_LIB, "assigning new lease to '%Y'", id); + DBG1(DBG_CFG, "assigning new lease to '%Y'", id); break; } @@ -252,7 +252,7 @@ METHOD(mem_pool_t, acquire_address, host_t*, { /* destroy reference to old ID */ old_id = this->ids->remove(this->ids, old_id); - DBG1(DBG_LIB, "reassigning existing offline lease by '%Y'" + DBG1(DBG_CFG, "reassigning existing offline lease by '%Y'" " to '%Y'", old_id, id); if (old_id) { @@ -267,7 +267,7 @@ METHOD(mem_pool_t, acquire_address, host_t*, } enumerator->destroy(enumerator); - DBG1(DBG_LIB, "pool '%s' is full, unable to assign address", + DBG1(DBG_CFG, "pool '%s' is full, unable to assign address", this->name); break; } @@ -294,7 +294,7 @@ METHOD(mem_pool_t, release_address, bool, id = this->ids->get(this->ids, id); if (id) { - DBG1(DBG_LIB, "lease %H by '%Y' went offline", address, id); + DBG1(DBG_CFG, "lease %H by '%Y' went offline", address, id); this->offline->put(this->offline, id, (void*)offset); found = TRUE; } @@ -433,7 +433,7 @@ mem_pool_t *mem_pool_create(char *name, host_t *base, int bits) if (bits > POOL_LIMIT) { bits = POOL_LIMIT; - DBG1(DBG_LIB, "virtual IP pool too large, limiting to %H/%d", + DBG1(DBG_CFG, "virtual IP pool too large, limiting to %H/%d", base, addr_bits - bits); } this->size = 1 << (bits); diff --git a/src/libhydra/plugins/attr/attr_provider.c b/src/libhydra/plugins/attr/attr_provider.c index 7f80225..9d6daa8 100644 --- a/src/libhydra/plugins/attr/attr_provider.c +++ b/src/libhydra/plugins/attr/attr_provider.c @@ -174,7 +174,7 @@ static void load_entries(private_attr_provider_t *this) host = host_create_from_string(token, 0); if (!host) { - DBG1(DBG_LIB, "invalid host in key %s: %s", key, token); + DBG1(DBG_CFG, "invalid host in key %s: %s", key, token); continue; } if (!type) @@ -195,7 +195,7 @@ static void load_entries(private_attr_provider_t *this) } if (!type) { - DBG1(DBG_LIB, "mapping attribute type %s failed", key); + DBG1(DBG_CFG, "mapping attribute type %s failed", key); break; } } diff --git a/src/libhydra/plugins/attr_sql/attr_sql_plugin.c b/src/libhydra/plugins/attr_sql/attr_sql_plugin.c index 280d01d..70e7a22 100644 --- a/src/libhydra/plugins/attr_sql/attr_sql_plugin.c +++ b/src/libhydra/plugins/attr_sql/attr_sql_plugin.c @@ -65,7 +65,7 @@ plugin_t *attr_sql_plugin_create() uri = lib->settings->get_str(lib->settings, "libhydra.plugins.attr-sql.database", NULL); if (!uri) { - DBG1(DBG_LIB, "attr-sql plugin: database URI not set"); + DBG1(DBG_CFG, "attr-sql plugin: database URI not set"); return NULL; } @@ -76,7 +76,7 @@ plugin_t *attr_sql_plugin_create() this->db = lib->db->create(lib->db, uri); if (!this->db) { - DBG1(DBG_LIB, "attr-sql plugin failed to connect to database"); + DBG1(DBG_CFG, "attr-sql plugin failed to connect to database"); free(this); return NULL; } diff --git a/src/libhydra/plugins/attr_sql/sql_attribute.c b/src/libhydra/plugins/attr_sql/sql_attribute.c index c328fd2..a7cfde6 100644 --- a/src/libhydra/plugins/attr_sql/sql_attribute.c +++ b/src/libhydra/plugins/attr_sql/sql_attribute.c @@ -127,7 +127,7 @@ static host_t* check_lease(private_sql_attribute_t *this, char *name, host = host_create_from_chunk(AF_UNSPEC, address, 0); if (host) { - DBG1(DBG_LIB, "acquired existing lease for address %H in" + DBG1(DBG_CFG, "acquired existing lease for address %H in" " pool '%s'", host, name); return host; } @@ -202,13 +202,13 @@ static host_t* get_lease(private_sql_attribute_t *this, char *name, host = host_create_from_chunk(AF_UNSPEC, address, 0); if (host) { - DBG1(DBG_LIB, "acquired new lease for address %H in pool '%s'", + DBG1(DBG_CFG, "acquired new lease for address %H in pool '%s'", host, name); return host; } } } - DBG1(DBG_LIB, "no available address found in pool '%s'", name); + DBG1(DBG_CFG, "no available address found in pool '%s'", name); return NULL; } diff --git a/src/pluto/plutomain.c b/src/pluto/plutomain.c index fe6b4b6..6ab1bfe 100644 --- a/src/pluto/plutomain.c +++ b/src/pluto/plutomain.c @@ -244,7 +244,7 @@ static void print_plugins() len += snprintf(&buf[len], BUF_LEN-len, "%s ", plugin); } enumerator->destroy(enumerator); - DBG1(DBG_LIB, "loaded plugins: %s", buf); + DBG1(DBG_DMN, "loaded plugins: %s", buf); } int main(int argc, char **argv) -- 2.7.4