use inst->name where possible

diff --git a/src/modules/rlm_couchbase/rlm_couchbase.c b/src/modules/rlm_couchbase/rlm_couchbase.c
index 07ae5043d84f0edd5656b2ff78eb413120d5bd95..6299f8ae2b7b24283f35f24fdf05e7633a0a2ca8 100644 (file)
--- a/src/modules/rlm_couchbase/rlm_couchbase.c
+++ b/src/modules/rlm_couchbase/rlm_couchbase.c
@@ -26,7 +26,7 @@
 
 RCSID("$Id$")
 
-#define LOG_PREFIX "rlm_couchbase"
+#define LOG_PREFIX inst->name
 
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/map.h>

diff --git a/src/modules/rlm_test/rlm_test.c b/src/modules/rlm_test/rlm_test.c
index c16ed511e0e2ef83c65b333b025bf8b46d483ecc..b03bd1b0b84d2ec1424624db8f336b9e670a2036 100644 (file)
--- a/src/modules/rlm_test/rlm_test.c
+++ b/src/modules/rlm_test/rlm_test.c
@@ -24,7 +24,7 @@
  */
 RCSID("$Id$")
 
-#define LOG_PREFIX "rlm_test"
+#define LOG_PREFIX inst->name
 
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/module.h>
@@ -111,6 +111,7 @@ typedef struct {
 } rlm_test_t;
 
 typedef struct {
+       rlm_test_t      *inst;
        pthread_t       value;
 } rlm_test_thread_t;
 
@@ -407,11 +408,13 @@ static xlat_action_t test_xlat(TALLOC_CTX *ctx, fr_dcursor_t *out, UNUSED reques
 }
 
 
-static int mod_thread_instantiate(UNUSED CONF_SECTION  const *cs, UNUSED void *instance, UNUSED fr_event_list_t *el,
+static int mod_thread_instantiate(UNUSED CONF_SECTION  const *cs, void *instance, UNUSED fr_event_list_t *el,
                                  void *thread)
 {
+       rlm_test_t *inst = instance;
        rlm_test_thread_t *t = thread;
 
+       t->inst = inst;
        t->value = pthread_self();
        INFO("Performing instantiation for thread %p (ctx %p)", (void *)t->value, t);
 
@@ -421,6 +424,7 @@ static int mod_thread_instantiate(UNUSED CONF_SECTION  const *cs, UNUSED void *i
 static int mod_thread_detach(UNUSED fr_event_list_t *el, void *thread)
 {
        rlm_test_thread_t *t = thread;
+       rlm_test_t *inst = t->inst;
 
        INFO("Performing detach for thread %p", (void *)t->value);
 

diff --git a/src/modules/rlm_unbound/rlm_unbound.c b/src/modules/rlm_unbound/rlm_unbound.c
index ebedb21f65cd916c75224887ca5ef2487715867d..0069ebf7b0784270775be5ed4adbe10b4a6cad04 100644 (file)
--- a/src/modules/rlm_unbound/rlm_unbound.c
+++ b/src/modules/rlm_unbound/rlm_unbound.c
@@ -24,7 +24,7 @@
  */
 RCSID("$Id$")
 
-#define LOG_PREFIX "rlm_unbound"
+#define LOG_PREFIX inst->name
 
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/module.h>