From: Alan T. DeKok <aland@freeradius.org>
Date: Mon, 8 Nov 2021 19:36:08 +0000 (-0500)
Subject: remove LOG_PREFIX_ARGS, and just use LOG_PREFIX everywhere
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=46bcc776191d9c02c375e0d62baec390a8068efc;p=thirdparty%2Ffreeradius-server.git

remove LOG_PREFIX_ARGS, and just use LOG_PREFIX everywhere

which simplifies things, in preparation for adding log IDs
everywhere, too.
---

diff --git a/src/lib/eap/base.c b/src/lib/eap/base.c
index 0337791e199..cfd1d2118d5 100644
--- a/src/lib/eap/base.c
+++ b/src/lib/eap/base.c
@@ -60,7 +60,7 @@
 
 RCSID("$Id$")
 
-#define LOG_PREFIX "rlm_eap - "
+#define LOG_PREFIX "rlm_eap"
 
 #include <freeradius-devel/eap/base.h>
 #include <freeradius-devel/server/virtual_servers.h>
diff --git a/src/lib/eap/compose.c b/src/lib/eap/compose.c
index f97db78431a..9e083a5e147 100644
--- a/src/lib/eap/compose.c
+++ b/src/lib/eap/compose.c
@@ -53,7 +53,7 @@
  * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
  *
  */
-#define LOG_PREFIX "rlm_eap - "
+#define LOG_PREFIX "rlm_eap"
 #include <freeradius-devel/server/modpriv.h>
 #include <freeradius-devel/server/pair.h>
 #include <freeradius-devel/radius/radius.h>
diff --git a/src/lib/io/network.c b/src/lib/io/network.c
index 771d979bbc5..e363810d003 100644
--- a/src/lib/io/network.c
+++ b/src/lib/io/network.c
@@ -24,8 +24,7 @@
  */
 RCSID("$Id$")
 
-#define LOG_PREFIX "%s - "
-#define LOG_PREFIX_ARGS nr->name
+#define LOG_PREFIX nr->name
 
 #define LOG_DST nr->log
 
diff --git a/src/lib/io/worker.c b/src/lib/io/worker.c
index 8fecb7b735a..f4d6315a0b0 100644
--- a/src/lib/io/worker.c
+++ b/src/lib/io/worker.c
@@ -48,8 +48,7 @@
  */
 RCSID("$Id$")
 
-#define LOG_PREFIX "%s - "
-#define LOG_PREFIX_ARGS worker->name
+#define LOG_PREFIX worker->name
 #define LOG_DST worker->log
 
 #include <freeradius-devel/io/channel.h>
diff --git a/src/lib/ldap/base.c b/src/lib/ldap/base.c
index f1d4fbc79db..26f8ecea6ec 100644
--- a/src/lib/ldap/base.c
+++ b/src/lib/ldap/base.c
@@ -30,8 +30,7 @@ USES_APPLE_DEPRECATED_API
 
 #include <freeradius-devel/util/debug.h>
 
-#define LOG_PREFIX "%s - "
-#define LOG_PREFIX_ARGS handle_config->name
+#define LOG_PREFIX handle_config->name
 
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/ldap/base.h>
diff --git a/src/lib/ldap/directory.c b/src/lib/ldap/directory.c
index c24e017542c..d40f02b06ba 100644
--- a/src/lib/ldap/directory.c
+++ b/src/lib/ldap/directory.c
@@ -28,8 +28,7 @@ RCSID("$Id$")
 
 USES_APPLE_DEPRECATED_API
 
-#define LOG_PREFIX "%s - "
-#define LOG_PREFIX_ARGS name
+#define LOG_PREFIX name
 
 #include <freeradius-devel/ldap/base.h>
 
diff --git a/src/lib/ldap/sasl_s.c b/src/lib/ldap/sasl_s.c
index 7e60c64bdd0..d5eb92154c0 100644
--- a/src/lib/ldap/sasl_s.c
+++ b/src/lib/ldap/sasl_s.c
@@ -27,8 +27,7 @@ RCSID("$Id$")
 
 USES_APPLE_DEPRECATED_API
 
-#define LOG_PREFIX "%s - "
-#define LOG_PREFIX_ARGS handle_config->name
+#define LOG_PREFIX handle_config->name
 
 #include <freeradius-devel/util/debug.h>
 #include <freeradius-devel/server/base.h>
diff --git a/src/lib/server/connection.c b/src/lib/server/connection.c
index 079a6f75bb3..5dad7381c3e 100644
--- a/src/lib/server/connection.c
+++ b/src/lib/server/connection.c
@@ -22,8 +22,7 @@
  *
  * @copyright 2017-2019 Arran Cudbard-Bell (a.cudbardb@freeradius.org)
  */
-#define LOG_PREFIX "%s "
-#define LOG_PREFIX_ARGS conn->pub.name
+#define LOG_PREFIX conn->pub.name
 
 typedef struct fr_connection_s fr_connection_t;
 #define _CONNECTION_PRIVATE 1
diff --git a/src/lib/server/log.h b/src/lib/server/log.h
index 8906d79c2e6..864750de038 100644
--- a/src/lib/server/log.h
+++ b/src/lib/server/log.h
@@ -183,19 +183,16 @@ void	log_global_free(void);
  *  The prefix is set with LOG_PREFIX, and arguments may
  *  be passed with LOG_PREFIX_ARGS
  */
-#ifndef LOG_PREFIX
-#  define LOG_PREFIX ""
-#endif
-#ifdef LOG_PREFIX_ARGS
-#  define _FR_LOG_PREFIX(_lvl, _fmt, ...) _FR_LOG_DST(_lvl, LOG_PREFIX _fmt, LOG_PREFIX_ARGS, ## __VA_ARGS__)
-#  define _FR_LOG_PREFIX_PERROR(_lvl, _fmt, ...) _FR_LOG_DST_PERROR(_lvl, LOG_PREFIX _fmt, LOG_PREFIX_ARGS, ## __VA_ARGS__)
-#  define _FR_LOG_PREFIX_FATAL(_fmt, ...) _FR_LOG_DST_FATAL(LOG_PREFIX _fmt, LOG_PREFIX_ARGS, ## __VA_ARGS__)
-#  define _FR_LOG_PREFIX_MARKER(_lvl, _str, _str_len, _marker_idx, _marker) _FR_LOG_DST_MARKER(_lvl, _str, _str_len, _marker_idx, _marker, LOG_PREFIX, LOG_PREFIX_ARGS)
+#ifdef LOG_PREFIX
+#  define _FR_LOG_PREFIX(_lvl, _fmt, ...) _FR_LOG_DST(_lvl, "%s - " _fmt, LOG_PREFIX, ## __VA_ARGS__)
+#  define _FR_LOG_PREFIX_PERROR(_lvl, _fmt, ...) _FR_LOG_DST_PERROR(_lvl, "%s - " _fmt, LOG_PREFIX, ## __VA_ARGS__)
+#  define _FR_LOG_PREFIX_FATAL(_fmt, ...) _FR_LOG_DST_FATAL("%s - " _fmt, LOG_PREFIX, ## __VA_ARGS__)
+#  define _FR_LOG_PREFIX_MARKER(_lvl, _str, _str_len, _marker_idx, _marker) _FR_LOG_DST_MARKER(_lvl, _str, _str_len, _marker_idx, _marker, "%s", LOG_PREFIX)
 #else
-#  define _FR_LOG_PREFIX(_lvl, _fmt, ...) _FR_LOG_DST(_lvl, LOG_PREFIX _fmt, ## __VA_ARGS__)
-#  define _FR_LOG_PREFIX_PERROR(_lvl, _fmt, ...) _FR_LOG_DST_PERROR(_lvl, LOG_PREFIX _fmt, ## __VA_ARGS__)
-#  define _FR_LOG_PREFIX_FATAL(_fmt, ...) _FR_LOG_DST_FATAL(LOG_PREFIX _fmt, ## __VA_ARGS__)
-#  define _FR_LOG_PREFIX_MARKER(_lvl, _str, _str_len, _marker_idx, _marker) _FR_LOG_DST_MARKER(_lvl, _str, _str_len, _marker_idx, _marker, LOG_PREFIX)
+#  define _FR_LOG_PREFIX(_lvl, _fmt, ...) _FR_LOG_DST(_lvl, _fmt, ## __VA_ARGS__)
+#  define _FR_LOG_PREFIX_PERROR(_lvl, _fmt, ...) _FR_LOG_DST_PERROR(_lvl, _fmt, ## __VA_ARGS__)
+#  define _FR_LOG_PREFIX_FATAL(_fmt, ...) _FR_LOG_DST_FATAL(_fmt, ## __VA_ARGS__)
+#  define _FR_LOG_PREFIX_MARKER(_lvl, _str, _str_len, _marker_idx, _marker) _FR_LOG_DST_MARKER(_lvl, _str, _str_len, _marker_idx, _marker, "")
 #endif
 
 /** @name Log global messages
diff --git a/src/lib/server/pool.c b/src/lib/server/pool.c
index f40bd2d415f..dcf244f7ece 100644
--- a/src/lib/server/pool.c
+++ b/src/lib/server/pool.c
@@ -25,8 +25,7 @@
  */
 RCSID("$Id$")
 
-#define LOG_PREFIX "%s - "
-#define LOG_PREFIX_ARGS pool->log_prefix
+#define LOG_PREFIX pool->log_prefix
 
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/modpriv.h>
diff --git a/src/lib/server/trunk.c b/src/lib/server/trunk.c
index 8e374483f6d..8d464481456 100644
--- a/src/lib/server/trunk.c
+++ b/src/lib/server/trunk.c
@@ -24,8 +24,7 @@
  * @copyright 2019-2020 The FreeRADIUS server project
  */
 
-#define LOG_PREFIX "%s - "
-#define LOG_PREFIX_ARGS trunk->log_prefix
+#define LOG_PREFIX trunk->log_prefix
 
 #ifdef NDEBUG
 #  define TALLOC_GET_TYPE_ABORT_NOOP 1
diff --git a/src/lib/tls/base.c b/src/lib/tls/base.c
index 0ff2963b35b..f754a475da1 100644
--- a/src/lib/tls/base.c
+++ b/src/lib/tls/base.c
@@ -28,7 +28,7 @@ RCSID("$Id$")
 USES_APPLE_DEPRECATED_API	/* OpenSSL API has been deprecated by Apple */
 
 #ifdef WITH_TLS
-#define LOG_PREFIX "tls - "
+#define LOG_PREFIX "tls"
 
 #include <openssl/conf.h>
 #if OPENSSL_VERSION_NUMBER >= 0x30000000L
diff --git a/src/lib/tls/cache.c b/src/lib/tls/cache.c
index ae63cf91c83..824393857e5 100644
--- a/src/lib/tls/cache.c
+++ b/src/lib/tls/cache.c
@@ -27,7 +27,7 @@ RCSID("$Id$")
 USES_APPLE_DEPRECATED_API	/* OpenSSL API has been deprecated by Apple */
 
 #ifdef WITH_TLS
-#define LOG_PREFIX "tls - "
+#define LOG_PREFIX "tls"
 
 #include <openssl/ssl.h>
 
diff --git a/src/lib/tls/cert.c b/src/lib/tls/cert.c
index fd01bd9bd79..3ad4e255483 100644
--- a/src/lib/tls/cert.c
+++ b/src/lib/tls/cert.c
@@ -26,7 +26,7 @@ RCSID("$Id$")
 USES_APPLE_DEPRECATED_API	/* OpenSSL API has been deprecated by Apple */
 
 #ifdef WITH_TLS
-#define LOG_PREFIX "tls - "
+#define LOG_PREFIX "tls"
 
 #include <openssl/ssl.h>
 
diff --git a/src/lib/tls/conf.c b/src/lib/tls/conf.c
index c78a0516834..65f8643d321 100644
--- a/src/lib/tls/conf.c
+++ b/src/lib/tls/conf.c
@@ -28,7 +28,7 @@ RCSID("$Id$")
 USES_APPLE_DEPRECATED_API	/* OpenSSL API has been deprecated by Apple */
 
 #ifdef WITH_TLS
-#define LOG_PREFIX "tls - "
+#define LOG_PREFIX "tls"
 
 #ifdef HAVE_SYS_STAT_H
 #  include <sys/stat.h>
diff --git a/src/lib/tls/ctx.c b/src/lib/tls/ctx.c
index 6b469f482da..e433ab60e6a 100644
--- a/src/lib/tls/ctx.c
+++ b/src/lib/tls/ctx.c
@@ -28,7 +28,7 @@ RCSID("$Id$")
 USES_APPLE_DEPRECATED_API	/* OpenSSL API has been deprecated by Apple */
 
 #ifdef WITH_TLS
-#define LOG_PREFIX "tls - "
+#define LOG_PREFIX "tls"
 
 #include <freeradius-devel/tls/log.h>
 #include <freeradius-devel/util/base16.h>
diff --git a/src/lib/tls/engine.c b/src/lib/tls/engine.c
index a87991e4b96..9a86e669ec1 100644
--- a/src/lib/tls/engine.c
+++ b/src/lib/tls/engine.c
@@ -27,7 +27,7 @@ RCSID("$Id$")
 USES_APPLE_DEPRECATED_API	/* OpenSSL API has been deprecated by Apple */
 
 #ifdef WITH_TLS
-#define LOG_PREFIX "tls - "
+#define LOG_PREFIX "tls"
 
 #include <freeradius-devel/tls/base.h>
 #include <freeradius-devel/tls/engine.h>
diff --git a/src/lib/tls/log.c b/src/lib/tls/log.c
index 9a8049035a9..bf608b61f94 100644
--- a/src/lib/tls/log.c
+++ b/src/lib/tls/log.c
@@ -27,7 +27,7 @@ RCSID("$Id$")
 USES_APPLE_DEPRECATED_API	/* OpenSSL API has been deprecated by Apple */
 
 #ifdef WITH_TLS
-#define LOG_PREFIX "tls - "
+#define LOG_PREFIX "tls"
 
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/util/debug.h>
diff --git a/src/lib/tls/pairs.c b/src/lib/tls/pairs.c
index 50709a1430f..c86abfcf4d2 100644
--- a/src/lib/tls/pairs.c
+++ b/src/lib/tls/pairs.c
@@ -26,7 +26,7 @@ RCSID("$Id$")
 USES_APPLE_DEPRECATED_API	/* OpenSSL API has been deprecated by Apple */
 
 #ifdef WITH_TLS
-#define LOG_PREFIX "tls - "
+#define LOG_PREFIX "tls"
 
 #include <openssl/x509v3.h>
 #include <openssl/ssl.h>
diff --git a/src/lib/tls/session.c b/src/lib/tls/session.c
index e4d9b32b79e..0776c3240ab 100644
--- a/src/lib/tls/session.c
+++ b/src/lib/tls/session.c
@@ -25,7 +25,7 @@
  * @copyright 2006-2016 The FreeRADIUS server project
  */
 #ifdef WITH_TLS
-#define LOG_PREFIX "tls - "
+#define LOG_PREFIX "tls"
 
 #include <freeradius-devel/server/pair.h>
 
diff --git a/src/lib/tls/verify.c b/src/lib/tls/verify.c
index 65d44017eaa..3b78ded25db 100644
--- a/src/lib/tls/verify.c
+++ b/src/lib/tls/verify.c
@@ -26,7 +26,7 @@
  * @copyright 2006-2016 The FreeRADIUS server project
  */
 #ifdef WITH_TLS
-#define LOG_PREFIX "tls - "
+#define LOG_PREFIX "tls"
 
 #include <freeradius-devel/server/exec.h>
 #include <freeradius-devel/server/pair.h>
diff --git a/src/lib/tls/virtual_server.c b/src/lib/tls/virtual_server.c
index fc338d7041e..ca4bd7203ba 100644
--- a/src/lib/tls/virtual_server.c
+++ b/src/lib/tls/virtual_server.c
@@ -23,7 +23,7 @@
  * @copyright 2021 Arran Cudbard-Bell (a.cudbardb@freeradius.org)
  */
 #ifdef WITH_TLS
-#define LOG_PREFIX "tls - "
+#define LOG_PREFIX "tls"
 
 #include <freeradius-devel/unlang/interpret.h>
 #include <freeradius-devel/unlang/call.h>
diff --git a/src/listen/control/radmin.c b/src/listen/control/radmin.c
index 362ecda2285..32da21adb66 100644
--- a/src/listen/control/radmin.c
+++ b/src/listen/control/radmin.c
@@ -65,7 +65,7 @@ DIAG_ON(strict-prototypes)
 #endif /* HAVE_READLINE_HISTORY */
 #endif /* HAVE_LIBREADLINE */
 
-#define LOG_PREFIX "radmin - "
+#define LOG_PREFIX "radmin"
 
 #include <freeradius-devel/server/cf_parse.h>
 #include <freeradius-devel/server/cf_file.h>
diff --git a/src/listen/dhcpv4/proto_dhcpv4.c b/src/listen/dhcpv4/proto_dhcpv4.c
index 4b209d5dbda..e3ba7ac6e8b 100644
--- a/src/listen/dhcpv4/proto_dhcpv4.c
+++ b/src/listen/dhcpv4/proto_dhcpv4.c
@@ -22,7 +22,7 @@
  * @copyright 2017 Arran Cudbard-Bell (a.cudbardb@freeradius.org)
  * @copyright 2016 Alan DeKok (aland@freeradius.org)
  */
-#define LOG_PREFIX "proto_dhcpv4 - "
+#define LOG_PREFIX "proto_dhcpv4"
 
 #include <freeradius-devel/io/listen.h>
 #include <freeradius-devel/server/module.h>
diff --git a/src/listen/dhcpv4/proto_dhcpv4_udp.c b/src/listen/dhcpv4/proto_dhcpv4_udp.c
index c4725cf4c0d..5eb49fe21fc 100644
--- a/src/listen/dhcpv4/proto_dhcpv4_udp.c
+++ b/src/listen/dhcpv4/proto_dhcpv4_udp.c
@@ -22,7 +22,7 @@
  * @copyright 2018 The FreeRADIUS server project.
  * @copyright 2018 Alan DeKok (aland@deployingradius.com)
  */
-#define LOG_PREFIX "proto_dhcpv4_udp - "
+#define LOG_PREFIX "proto_dhcpv4_udp"
 
 #include <netdb.h>
 #include <freeradius-devel/server/protocol.h>
diff --git a/src/listen/dhcpv6/proto_dhcpv6.c b/src/listen/dhcpv6/proto_dhcpv6.c
index 71faca50c4d..ec04ef8377d 100644
--- a/src/listen/dhcpv6/proto_dhcpv6.c
+++ b/src/listen/dhcpv6/proto_dhcpv6.c
@@ -21,7 +21,7 @@
  *
  * @copyright 2020 Network RADIUS SARL (legal@networkradius.com)
  */
-#define LOG_PREFIX "proto_dhcpv6 - "
+#define LOG_PREFIX "proto_dhcpv6"
 
 #include <freeradius-devel/io/listen.h>
 #include <freeradius-devel/server/module.h>
diff --git a/src/listen/dhcpv6/proto_dhcpv6_udp.c b/src/listen/dhcpv6/proto_dhcpv6_udp.c
index 29b52af0fd7..a894c88f88f 100644
--- a/src/listen/dhcpv6/proto_dhcpv6_udp.c
+++ b/src/listen/dhcpv6/proto_dhcpv6_udp.c
@@ -21,7 +21,7 @@
  *
  * @copyright 2020 Network RADIUS SARL (legal@networkradius.com)
  */
-#define LOG_PREFIX "proto_dhcpv6_udp - "
+#define LOG_PREFIX "proto_dhcpv6_udp"
 
 #include <freeradius-devel/server/protocol.h>
 #include <freeradius-devel/util/udp.h>
diff --git a/src/listen/dns/proto_dns.c b/src/listen/dns/proto_dns.c
index e2ede7df655..5adef38f779 100644
--- a/src/listen/dns/proto_dns.c
+++ b/src/listen/dns/proto_dns.c
@@ -21,7 +21,7 @@
  *
  * @copyright 2020 Network RADIUS SARL (legal@networkradius.com)
  */
-#define LOG_PREFIX "proto_dns - "
+#define LOG_PREFIX "proto_dns"
 
 #include <freeradius-devel/io/listen.h>
 #include <freeradius-devel/server/module.h>
diff --git a/src/listen/dns/proto_dns_udp.c b/src/listen/dns/proto_dns_udp.c
index 76bbd38a1a2..17fe82441f3 100644
--- a/src/listen/dns/proto_dns_udp.c
+++ b/src/listen/dns/proto_dns_udp.c
@@ -21,7 +21,7 @@
  *
  * @copyright 2020 Network RADIUS SARL (legal@networkradius.com)
  */
-#define LOG_PREFIX "proto_dns_udp - "
+#define LOG_PREFIX "proto_dns_udp"
 
 #include <freeradius-devel/server/protocol.h>
 #include <freeradius-devel/util/udp.h>
diff --git a/src/modules/rlm_always/rlm_always.c b/src/modules/rlm_always/rlm_always.c
index c30f89ca989..0548621b8e9 100644
--- a/src/modules/rlm_always/rlm_always.c
+++ b/src/modules/rlm_always/rlm_always.c
@@ -24,8 +24,7 @@
  */
 RCSID("$Id$")
 
-#define LOG_PREFIX "%s - "
-#define LOG_PREFIX_ARGS inst->name
+#define LOG_PREFIX inst->name
 
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/module.h>
diff --git a/src/modules/rlm_attr_filter/rlm_attr_filter.c b/src/modules/rlm_attr_filter/rlm_attr_filter.c
index d7b52ec077c..a451826b93b 100644
--- a/src/modules/rlm_attr_filter/rlm_attr_filter.c
+++ b/src/modules/rlm_attr_filter/rlm_attr_filter.c
@@ -24,8 +24,7 @@
  */
 RCSID("$Id$")
 
-#define LOG_PREFIX "%s - "
-#define LOG_PREFIX_ARGS inst->name
+#define LOG_PREFIX inst->name
 
 #include	<freeradius-devel/server/base.h>
 #include	<freeradius-devel/server/module.h>
diff --git a/src/modules/rlm_cache/drivers/rlm_cache_memcached/rlm_cache_memcached.c b/src/modules/rlm_cache/drivers/rlm_cache_memcached/rlm_cache_memcached.c
index 4aa96793d72..23ff48213e4 100644
--- a/src/modules/rlm_cache/drivers/rlm_cache_memcached/rlm_cache_memcached.c
+++ b/src/modules/rlm_cache/drivers/rlm_cache_memcached/rlm_cache_memcached.c
@@ -22,7 +22,7 @@
  * @copyright 2014 The FreeRADIUS server project
  */
 
-#define LOG_PREFIX "rlm_cache_memcached - "
+#define LOG_PREFIX "rlm_cache_memcached"
 
 #include <libmemcached/memcached.h>
 
diff --git a/src/modules/rlm_cache/drivers/rlm_cache_redis/rlm_cache_redis.c b/src/modules/rlm_cache/drivers/rlm_cache_redis/rlm_cache_redis.c
index bd39048e7ce..1b03e1529dd 100644
--- a/src/modules/rlm_cache/drivers/rlm_cache_redis/rlm_cache_redis.c
+++ b/src/modules/rlm_cache/drivers/rlm_cache_redis/rlm_cache_redis.c
@@ -21,7 +21,7 @@
  *
  * @copyright 2015 Arran Cudbard-Bell (a.cudbardb@freeradius.org)
  */
-#define LOG_PREFIX "rlm_cache_redis - "
+#define LOG_PREFIX "rlm_cache_redis"
 
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/util/debug.h>
diff --git a/src/modules/rlm_cache/rlm_cache.c b/src/modules/rlm_cache/rlm_cache.c
index 94b0bcbfc8d..855338a72f7 100644
--- a/src/modules/rlm_cache/rlm_cache.c
+++ b/src/modules/rlm_cache/rlm_cache.c
@@ -23,8 +23,7 @@
  */
 RCSID("$Id$")
 
-#define LOG_PREFIX "%s - "
-#define LOG_PREFIX_ARGS inst->config.name
+#define LOG_PREFIX inst->config.name
 
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/module.h>
diff --git a/src/modules/rlm_chap/rlm_chap.c b/src/modules/rlm_chap/rlm_chap.c
index 42fc5d54274..45dfdc40ac7 100644
--- a/src/modules/rlm_chap/rlm_chap.c
+++ b/src/modules/rlm_chap/rlm_chap.c
@@ -23,8 +23,7 @@
  */
 RCSID("$Id$")
 
-#define LOG_PREFIX "%s - "
-#define LOG_PREFIX_ARGS inst->name
+#define LOG_PREFIX inst->name
 
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/password.h>
diff --git a/src/modules/rlm_couchbase/couchbase.c b/src/modules/rlm_couchbase/couchbase.c
index 0cf09516490..b33f43ba079 100644
--- a/src/modules/rlm_couchbase/couchbase.c
+++ b/src/modules/rlm_couchbase/couchbase.c
@@ -25,7 +25,7 @@
  */
 RCSID("$Id$")
 
-#define LOG_PREFIX "rlm_couchbase - "
+#define LOG_PREFIX "rlm_couchbase"
 
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/json/base.h>
diff --git a/src/modules/rlm_couchbase/mod.c b/src/modules/rlm_couchbase/mod.c
index 8e20208d2a5..b1a16e0032a 100644
--- a/src/modules/rlm_couchbase/mod.c
+++ b/src/modules/rlm_couchbase/mod.c
@@ -25,7 +25,7 @@
  */
 RCSID("$Id$")
 
-#define LOG_PREFIX "rlm_couchbase - "
+#define LOG_PREFIX "rlm_couchbase"
 
 #include <freeradius-devel/json/base.h>
 #include <freeradius-devel/server/base.h>
diff --git a/src/modules/rlm_couchbase/rlm_couchbase.c b/src/modules/rlm_couchbase/rlm_couchbase.c
index 41588093a8d..07ae5043d84 100644
--- 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 "rlm_couchbase"
 
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/map.h>
diff --git a/src/modules/rlm_detail/rlm_detail.c b/src/modules/rlm_detail/rlm_detail.c
index 96547f3b20d..8962f445f03 100644
--- a/src/modules/rlm_detail/rlm_detail.c
+++ b/src/modules/rlm_detail/rlm_detail.c
@@ -23,8 +23,7 @@
  */
 RCSID("$Id$")
 
-#define LOG_PREFIX "rlm_detail (%s) - "
-#define LOG_PREFIX_ARGS inst->name
+#define LOG_PREFIX inst->name
 
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/exfile.h>
diff --git a/src/modules/rlm_eap/rlm_eap.c b/src/modules/rlm_eap/rlm_eap.c
index 07a3b2c9a35..760c6adf6a1 100644
--- a/src/modules/rlm_eap/rlm_eap.c
+++ b/src/modules/rlm_eap/rlm_eap.c
@@ -25,8 +25,7 @@
  */
 RCSID("$Id$")
 
-#define LOG_PREFIX "%s - "
-#define LOG_PREFIX_ARGS inst->name
+#define LOG_PREFIX inst->name
 
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/module.h>
diff --git a/src/modules/rlm_eap/types/rlm_eap_gtc/rlm_eap_gtc.c b/src/modules/rlm_eap/types/rlm_eap_gtc/rlm_eap_gtc.c
index 59e4c319fda..1982ffdc166 100644
--- a/src/modules/rlm_eap/types/rlm_eap_gtc/rlm_eap_gtc.c
+++ b/src/modules/rlm_eap/types/rlm_eap_gtc/rlm_eap_gtc.c
@@ -23,7 +23,7 @@
  */
 RCSID("$Id$")
 
-#define LOG_PREFIX "rlm_eap_gtc - "
+#define LOG_PREFIX "rlm_eap_gtc"
 
 #include <freeradius-devel/eap/base.h>
 #include <freeradius-devel/util/debug.h>
diff --git a/src/modules/rlm_eap/types/rlm_eap_md5/eap_md5.c b/src/modules/rlm_eap/types/rlm_eap_md5/eap_md5.c
index 99568173226..c0b30e57e38 100644
--- a/src/modules/rlm_eap/types/rlm_eap_md5/eap_md5.c
+++ b/src/modules/rlm_eap/types/rlm_eap_md5/eap_md5.c
@@ -36,7 +36,7 @@
  */
 RCSID("$Id$")
 
-#define LOG_PREFIX "rlm_eap_md5 - "
+#define LOG_PREFIX "rlm_eap_md5"
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src/modules/rlm_eap/types/rlm_eap_peap/rlm_eap_peap.c b/src/modules/rlm_eap/types/rlm_eap_peap/rlm_eap_peap.c
index e7274d3ddaf..8c075a72c70 100644
--- a/src/modules/rlm_eap/types/rlm_eap_peap/rlm_eap_peap.c
+++ b/src/modules/rlm_eap/types/rlm_eap_peap/rlm_eap_peap.c
@@ -22,7 +22,7 @@
  */
 RCSID("$Id$")
 
-#define LOG_PREFIX "rlm_eap_peap - "
+#define LOG_PREFIX "rlm_eap_peap"
 
 #include <freeradius-devel/eap/tls.h>
 #include "eap_peap.h"
diff --git a/src/modules/rlm_eap/types/rlm_eap_pwd/rlm_eap_pwd.c b/src/modules/rlm_eap/types/rlm_eap_pwd/rlm_eap_pwd.c
index f4b7a044940..253ff664fcd 100644
--- a/src/modules/rlm_eap/types/rlm_eap_pwd/rlm_eap_pwd.c
+++ b/src/modules/rlm_eap/types/rlm_eap_pwd/rlm_eap_pwd.c
@@ -33,7 +33,7 @@
 RCSID("$Id$")
 USES_APPLE_DEPRECATED_API	/* OpenSSL API has been deprecated by Apple */
 
-#define LOG_PREFIX "rlm_eap_pwd - "
+#define LOG_PREFIX "rlm_eap_pwd"
 
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/module.h>
diff --git a/src/modules/rlm_eap/types/rlm_eap_tls/rlm_eap_tls.c b/src/modules/rlm_eap/types/rlm_eap_tls/rlm_eap_tls.c
index 8bc653e3227..1b6874631d3 100644
--- a/src/modules/rlm_eap/types/rlm_eap_tls/rlm_eap_tls.c
+++ b/src/modules/rlm_eap/types/rlm_eap_tls/rlm_eap_tls.c
@@ -25,7 +25,7 @@
 RCSID("$Id$")
 USES_APPLE_DEPRECATED_API	/* OpenSSL API has been deprecated by Apple */
 
-#define LOG_PREFIX "rlm_eap_tls - "
+#define LOG_PREFIX "rlm_eap_tls"
 
 #ifdef HAVE_OPENSSL_RAND_H
 #  include <openssl/rand.h>
diff --git a/src/modules/rlm_eap/types/rlm_eap_ttls/rlm_eap_ttls.c b/src/modules/rlm_eap/types/rlm_eap_ttls/rlm_eap_ttls.c
index 5e9b1be7ef0..37697d839af 100644
--- a/src/modules/rlm_eap/types/rlm_eap_ttls/rlm_eap_ttls.c
+++ b/src/modules/rlm_eap/types/rlm_eap_ttls/rlm_eap_ttls.c
@@ -26,7 +26,7 @@
 RCSID("$Id$")
 USES_APPLE_DEPRECATED_API	/* OpenSSL API has been deprecated by Apple */
 
-#define LOG_PREFIX "rlm_eap_ttls - "
+#define LOG_PREFIX "rlm_eap_ttls"
 
 #include <freeradius-devel/eap/tls.h>
 #include "eap_ttls.h"
diff --git a/src/modules/rlm_exec/rlm_exec.c b/src/modules/rlm_exec/rlm_exec.c
index 908496ed5da..c051563043d 100644
--- a/src/modules/rlm_exec/rlm_exec.c
+++ b/src/modules/rlm_exec/rlm_exec.c
@@ -24,8 +24,7 @@
  */
 RCSID("$Id$")
 
-#define LOG_PREFIX "rlm_exec (%s) - "
-#define LOG_PREFIX_ARGS inst->name
+#define LOG_PREFIX inst->name
 
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/module.h>
diff --git a/src/modules/rlm_icmp/rlm_icmp.c b/src/modules/rlm_icmp/rlm_icmp.c
index 97ff433cc2d..38102561b89 100644
--- a/src/modules/rlm_icmp/rlm_icmp.c
+++ b/src/modules/rlm_icmp/rlm_icmp.c
@@ -23,8 +23,7 @@
  */
 RCSID("$Id$")
 
-#define LOG_PREFIX "rlm_icmp (%s) - "
-#define LOG_PREFIX_ARGS inst->name
+#define LOG_PREFIX inst->name
 
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/module.h>
diff --git a/src/modules/rlm_krb5/krb5.c b/src/modules/rlm_krb5/krb5.c
index bb771257ba8..9d1809d2c9e 100644
--- a/src/modules/rlm_krb5/krb5.c
+++ b/src/modules/rlm_krb5/krb5.c
@@ -24,8 +24,7 @@
  */
 RCSID("$Id$")
 
-#define LOG_PREFIX "rlm_krb5 (%s) - "
-#define LOG_PREFIX_ARGS inst->name
+#define LOG_PREFIX inst->name
 
 #include <freeradius-devel/util/debug.h>
 #include <freeradius-devel/server/base.h>
diff --git a/src/modules/rlm_krb5/rlm_krb5.c b/src/modules/rlm_krb5/rlm_krb5.c
index 3d225b30291..65555cc3524 100644
--- a/src/modules/rlm_krb5/rlm_krb5.c
+++ b/src/modules/rlm_krb5/rlm_krb5.c
@@ -26,8 +26,7 @@
  */
 RCSID("$Id$")
 
-#define LOG_PREFIX "rlm_krb5 (%s) - "
-#define LOG_PREFIX_ARGS inst->name
+#define LOG_PREFIX inst->name
 
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/module.h>
diff --git a/src/modules/rlm_ldap/groups.c b/src/modules/rlm_ldap/groups.c
index f8f14578cbe..4c1ba3b3414 100644
--- a/src/modules/rlm_ldap/groups.c
+++ b/src/modules/rlm_ldap/groups.c
@@ -31,8 +31,7 @@ USES_APPLE_DEPRECATED_API
 #include <freeradius-devel/util/debug.h>
 #include <ctype.h>
 
-#define LOG_PREFIX "rlm_ldap (%s) - "
-#define LOG_PREFIX_ARGS inst->name
+#define LOG_PREFIX inst->name
 
 #include "rlm_ldap.h"
 
diff --git a/src/modules/rlm_ldap/user.c b/src/modules/rlm_ldap/user.c
index d8e2a0be728..68a264ff2d3 100644
--- a/src/modules/rlm_ldap/user.c
+++ b/src/modules/rlm_ldap/user.c
@@ -31,8 +31,7 @@ USES_APPLE_DEPRECATED_API
 #include <freeradius-devel/util/debug.h>
 #include <ctype.h>
 
-#define LOG_PREFIX "rlm_ldap (%s) - "
-#define LOG_PREFIX_ARGS inst->name
+#define LOG_PREFIX inst->name
 
 #include "rlm_ldap.h"
 
diff --git a/src/modules/rlm_lua/lua.c b/src/modules/rlm_lua/lua.c
index d2b280a0947..3222f7f486d 100644
--- a/src/modules/rlm_lua/lua.c
+++ b/src/modules/rlm_lua/lua.c
@@ -25,8 +25,7 @@
  */
 RCSID("$Id$")
 
-#define LOG_PREFIX "rlm_lua (%s) - "
-#define LOG_PREFIX_ARGS inst->name
+#define LOG_PREFIX inst->name
 
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/util/debug.h>
diff --git a/src/modules/rlm_lua/rlm_lua.c b/src/modules/rlm_lua/rlm_lua.c
index 21cdf9a239b..65ef8d8ca1d 100644
--- a/src/modules/rlm_lua/rlm_lua.c
+++ b/src/modules/rlm_lua/rlm_lua.c
@@ -25,8 +25,7 @@
  */
 RCSID("$Id$")
 
-#define LOG_PREFIX "rlm_lua (%s) - "
-#define LOG_PREFIX_ARGS inst->name
+#define LOG_PREFIX inst->name
 
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/util/debug.h>
diff --git a/src/modules/rlm_lua/util.c b/src/modules/rlm_lua/util.c
index d57c0b8d09e..6f5842b9960 100644
--- a/src/modules/rlm_lua/util.c
+++ b/src/modules/rlm_lua/util.c
@@ -24,8 +24,7 @@
  */
 RCSID("$Id$")
 
-#define LOG_PREFIX "rlm_lua (%s) - "
-#define LOG_PREFIX_ARGS inst->name
+#define LOG_PREFIX inst->name
 
 #include <freeradius-devel/server/base.h>
 
diff --git a/src/modules/rlm_mschap/rlm_mschap.c b/src/modules/rlm_mschap/rlm_mschap.c
index a8a84261837..65b7b0b5431 100644
--- a/src/modules/rlm_mschap/rlm_mschap.c
+++ b/src/modules/rlm_mschap/rlm_mschap.c
@@ -25,8 +25,7 @@
 /*  MPPE support from Takahiro Wagatsuma <waga@sic.shibaura-it.ac.jp> */
 RCSID("$Id$")
 
-#define LOG_PREFIX "%s - "
-#define LOG_PREFIX_ARGS inst->name
+#define LOG_PREFIX inst->name
 
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/exec_legacy.h>
diff --git a/src/modules/rlm_ocsp/ocsp.c b/src/modules/rlm_ocsp/ocsp.c
index afde5188631..0bc952e3146 100644
--- a/src/modules/rlm_ocsp/ocsp.c
+++ b/src/modules/rlm_ocsp/ocsp.c
@@ -28,7 +28,7 @@ USES_APPLE_DEPRECATED_API	/* OpenSSL API has been deprecated by Apple */
 #ifdef WITH_TLS
 #undef HAVE_OPENSSL_OCSP_H
 #ifdef HAVE_OPENSSL_OCSP_H
-#define LOG_PREFIX "tls - ocsp - "
+#define LOG_PREFIX "tls - ocsp"
 
 #include <freeradius-devel/server/module.h>
 #include <freeradius-devel/server/pair.h>
diff --git a/src/modules/rlm_passwd/rlm_passwd.c b/src/modules/rlm_passwd/rlm_passwd.c
index 6d415ac288b..52b561a88f0 100644
--- a/src/modules/rlm_passwd/rlm_passwd.c
+++ b/src/modules/rlm_passwd/rlm_passwd.c
@@ -23,7 +23,7 @@
  */
 RCSID("$Id$")
 
-#define LOG_PREFIX "rlm_passwd - "
+#define LOG_PREFIX "rlm_passwd"
 
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/module.h>
diff --git a/src/modules/rlm_perl/rlm_perl.c b/src/modules/rlm_perl/rlm_perl.c
index 55dcd75f69f..3c016a6b9d9 100644
--- a/src/modules/rlm_perl/rlm_perl.c
+++ b/src/modules/rlm_perl/rlm_perl.c
@@ -24,7 +24,7 @@
  */
 RCSID("$Id$")
 
-#define LOG_PREFIX "rlm_perl - "
+#define LOG_PREFIX "rlm_perl"
 
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/module.h>
diff --git a/src/modules/rlm_python/rlm_python.c b/src/modules/rlm_python/rlm_python.c
index cd42b8cd417..9228b81691b 100644
--- a/src/modules/rlm_python/rlm_python.c
+++ b/src/modules/rlm_python/rlm_python.c
@@ -27,8 +27,7 @@
  */
 RCSID("$Id$")
 
-#define LOG_PREFIX "rlm_python (%s) - "
-#define LOG_PREFIX_ARGS inst->name
+#define LOG_PREFIX inst->name
 
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/module.h>
diff --git a/src/modules/rlm_rest/rest.c b/src/modules/rlm_rest/rest.c
index 6a080c587a4..6bf23516e1d 100644
--- a/src/modules/rlm_rest/rest.c
+++ b/src/modules/rlm_rest/rest.c
@@ -25,8 +25,7 @@
 
 RCSID("$Id$")
 
-#define LOG_PREFIX "rlm_rest (%s) - "
-#define LOG_PREFIX_ARGS inst->name
+#define LOG_PREFIX inst->name
 
 #include <ctype.h>
 #include <string.h>
diff --git a/src/modules/rlm_securid/mem.c b/src/modules/rlm_securid/mem.c
index c325887a29f..f48294f29f4 100644
--- a/src/modules/rlm_securid/mem.c
+++ b/src/modules/rlm_securid/mem.c
@@ -19,7 +19,7 @@
  * @copyright 2012 Alan DeKok (aland@networkradius.com)
  */
 
-#define LOG_PREFIX "rlm_securid - "
+#define LOG_PREFIX "rlm_securid"
 
 #include <stdio.h>
 #include "rlm_securid.h"
diff --git a/src/modules/rlm_sigtran/client.c b/src/modules/rlm_sigtran/client.c
index b5bd140fc58..ce7bb848b98 100644
--- a/src/modules/rlm_sigtran/client.c
+++ b/src/modules/rlm_sigtran/client.c
@@ -24,7 +24,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-#define LOG_PREFIX "rlm_sigtran - "
+#define LOG_PREFIX "rlm_sigtran"
 
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/util/debug.h>
diff --git a/src/modules/rlm_sigtran/event.c b/src/modules/rlm_sigtran/event.c
index a887c59bc9e..4655a15ce97 100644
--- a/src/modules/rlm_sigtran/event.c
+++ b/src/modules/rlm_sigtran/event.c
@@ -56,7 +56,7 @@
  *
  * @copyright 2016 Network RADIUS SARL (license@networkradius.com)
  */
-#define LOG_PREFIX "rlm_sigtran - "
+#define LOG_PREFIX "rlm_sigtran"
 
 #include <osmocom/core/talloc.h>
 
diff --git a/src/modules/rlm_sigtran/log.c b/src/modules/rlm_sigtran/log.c
index 68c79367455..f603b77d2ec 100644
--- a/src/modules/rlm_sigtran/log.c
+++ b/src/modules/rlm_sigtran/log.c
@@ -30,7 +30,7 @@
  * @file rlm_sigtran/log.c
  * @brief Interface libosmo with FreeRADIUS logging
  */
-#define LOG_PREFIX "rlm_sigtran - "
+#define LOG_PREFIX "rlm_sigtran"
 
 #include <freeradius-devel/server/base.h>
 #include <osmocom/core/logging.h>
diff --git a/src/modules/rlm_sigtran/rlm_sigtran.c b/src/modules/rlm_sigtran/rlm_sigtran.c
index 4647f56ad4e..b6857aaa6cf 100644
--- a/src/modules/rlm_sigtran/rlm_sigtran.c
+++ b/src/modules/rlm_sigtran/rlm_sigtran.c
@@ -34,7 +34,6 @@
  */
 RCSID("$Id$")
 
-#define LOG_PREFIX "rlm_sigtran (%s) - "
 #define LOG_PREFIX_ARGS inst->name
 
 #include <osmocom/core/linuxlist.h>
diff --git a/src/modules/rlm_sigtran/sccp.c b/src/modules/rlm_sigtran/sccp.c
index d9f41310b73..70d3f9f5612 100644
--- a/src/modules/rlm_sigtran/sccp.c
+++ b/src/modules/rlm_sigtran/sccp.c
@@ -34,7 +34,7 @@
  *
  * @copyright 2016 Network RADIUS SARL (license@networkradius.com)
  */
-#define LOG_PREFIX "rlm_sigtran - osmocom thread - "
+#define LOG_PREFIX "rlm_sigtran - osmocom thread"
 
 #include <osmocom/core/talloc.h>
 
diff --git a/src/modules/rlm_sigtran/sigtran.c b/src/modules/rlm_sigtran/sigtran.c
index c8b1b560a41..ecd2cafee2b 100644
--- a/src/modules/rlm_sigtran/sigtran.c
+++ b/src/modules/rlm_sigtran/sigtran.c
@@ -30,7 +30,7 @@
  * @file rlm_sigtran/sigtran.c
  * @brief Miscellaneous functions.
  */
-#define LOG_PREFIX "rlm_sigtran - "
+#define LOG_PREFIX "rlm_sigtran"
 
 #include <osmocom/core/linuxlist.h>
 #include <osmocom/core/talloc.h>
diff --git a/src/modules/rlm_sql/drivers/rlm_sql_cassandra/rlm_sql_cassandra.c b/src/modules/rlm_sql/drivers/rlm_sql_cassandra/rlm_sql_cassandra.c
index 686909270e4..ef705fac436 100644
--- a/src/modules/rlm_sql/drivers/rlm_sql_cassandra/rlm_sql_cassandra.c
+++ b/src/modules/rlm_sql/drivers/rlm_sql_cassandra/rlm_sql_cassandra.c
@@ -33,7 +33,7 @@
  * @author Linnaea Von Lavia (le.concorde.4590@gmail.com)
  * @author Arran Cudbard-Bell (a.cudbardb@freeradius.org)
  */
-#define LOG_PREFIX "rlm_sql_cassandra - "
+#define LOG_PREFIX "rlm_sql_cassandra"
 
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/util/debug.h>
diff --git a/src/modules/rlm_sql/drivers/rlm_sql_db2/rlm_sql_db2.c b/src/modules/rlm_sql/drivers/rlm_sql_db2/rlm_sql_db2.c
index a52b89e3941..9f09a636c73 100644
--- a/src/modules/rlm_sql/drivers/rlm_sql_db2/rlm_sql_db2.c
+++ b/src/modules/rlm_sql/drivers/rlm_sql_db2/rlm_sql_db2.c
@@ -29,7 +29,7 @@
  */
 RCSID("$Id$")
 
-#define LOG_PREFIX "rlm_sql_db2 - "
+#define LOG_PREFIX "rlm_sql_db2"
 
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/util/debug.h>
diff --git a/src/modules/rlm_sql/drivers/rlm_sql_firebird/rlm_sql_firebird.c b/src/modules/rlm_sql/drivers/rlm_sql_firebird/rlm_sql_firebird.c
index d7e82cacc5e..b5783424511 100644
--- a/src/modules/rlm_sql/drivers/rlm_sql_firebird/rlm_sql_firebird.c
+++ b/src/modules/rlm_sql/drivers/rlm_sql_firebird/rlm_sql_firebird.c
@@ -20,7 +20,7 @@
  */
 RCSID("$Id$")
 
-#define LOG_PREFIX "rlm_sql_firebird - "
+#define LOG_PREFIX "rlm_sql_firebird"
 
 #include "sql_fbapi.h"
 #include <freeradius-devel/util/debug.h>
diff --git a/src/modules/rlm_sql/drivers/rlm_sql_freetds/rlm_sql_freetds.c b/src/modules/rlm_sql/drivers/rlm_sql_freetds/rlm_sql_freetds.c
index 9492abcbdca..9314c712b42 100644
--- a/src/modules/rlm_sql/drivers/rlm_sql_freetds/rlm_sql_freetds.c
+++ b/src/modules/rlm_sql/drivers/rlm_sql_freetds/rlm_sql_freetds.c
@@ -26,7 +26,7 @@
 
 RCSID("$Id$")
 
-#define LOG_PREFIX "rlm_sql_freetds - "
+#define LOG_PREFIX "rlm_sql_freetds"
 
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/util/debug.h>
diff --git a/src/modules/rlm_sql/drivers/rlm_sql_mysql/rlm_sql_mysql.c b/src/modules/rlm_sql/drivers/rlm_sql_mysql/rlm_sql_mysql.c
index 3da432ad69b..b2eb664eed0 100644
--- a/src/modules/rlm_sql/drivers/rlm_sql_mysql/rlm_sql_mysql.c
+++ b/src/modules/rlm_sql/drivers/rlm_sql_mysql/rlm_sql_mysql.c
@@ -26,7 +26,7 @@
  */
 RCSID("$Id$")
 
-#define LOG_PREFIX "rlm_sql_mysql - "
+#define LOG_PREFIX "rlm_sql_mysql"
 
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/util/debug.h>
diff --git a/src/modules/rlm_sql/drivers/rlm_sql_oracle/rlm_sql_oracle.c b/src/modules/rlm_sql/drivers/rlm_sql_oracle/rlm_sql_oracle.c
index 689ec58e1df..4e11f4423aa 100644
--- a/src/modules/rlm_sql/drivers/rlm_sql_oracle/rlm_sql_oracle.c
+++ b/src/modules/rlm_sql/drivers/rlm_sql_oracle/rlm_sql_oracle.c
@@ -22,7 +22,7 @@
 
 RCSID("$Id$")
 
-#define LOG_PREFIX "rlm_sql_oracle - "
+#define LOG_PREFIX "rlm_sql_oracle"
 
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/util/debug.h>
diff --git a/src/modules/rlm_sql/drivers/rlm_sql_postgresql/rlm_sql_postgresql.c b/src/modules/rlm_sql/drivers/rlm_sql_postgresql/rlm_sql_postgresql.c
index 9d597feeff7..363d55a908e 100644
--- a/src/modules/rlm_sql/drivers/rlm_sql_postgresql/rlm_sql_postgresql.c
+++ b/src/modules/rlm_sql/drivers/rlm_sql_postgresql/rlm_sql_postgresql.c
@@ -39,7 +39,7 @@
 
 RCSID("$Id$")
 
-#define LOG_PREFIX "rlm_sql_postgresql - "
+#define LOG_PREFIX "rlm_sql_postgresql"
 
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/util/debug.h>
diff --git a/src/modules/rlm_sql/drivers/rlm_sql_sqlite/rlm_sql_sqlite.c b/src/modules/rlm_sql/drivers/rlm_sql_sqlite/rlm_sql_sqlite.c
index 85896bf6359..3a810865002 100644
--- a/src/modules/rlm_sql/drivers/rlm_sql_sqlite/rlm_sql_sqlite.c
+++ b/src/modules/rlm_sql/drivers/rlm_sql_sqlite/rlm_sql_sqlite.c
@@ -24,7 +24,7 @@
  */
 RCSID("$Id$")
 
-#define LOG_PREFIX "rlm_sql_sqlite - "
+#define LOG_PREFIX "rlm_sql_sqlite"
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/util/debug.h>
 
diff --git a/src/modules/rlm_sql/drivers/rlm_sql_unixodbc/rlm_sql_unixodbc.c b/src/modules/rlm_sql/drivers/rlm_sql_unixodbc/rlm_sql_unixodbc.c
index c2a414d2572..91d760c0501 100644
--- a/src/modules/rlm_sql/drivers/rlm_sql_unixodbc/rlm_sql_unixodbc.c
+++ b/src/modules/rlm_sql/drivers/rlm_sql_unixodbc/rlm_sql_unixodbc.c
@@ -21,7 +21,7 @@
 RCSID("$Id$")
 USES_APPLE_DEPRECATED_API
 
-#define LOG_PREFIX "rlm_sql_unixodbc - "
+#define LOG_PREFIX "rlm_sql_unixodbc"
 
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/util/debug.h>
diff --git a/src/modules/rlm_sql/rlm_sql.c b/src/modules/rlm_sql/rlm_sql.c
index 726549d80ec..e6c5e52adef 100644
--- a/src/modules/rlm_sql/rlm_sql.c
+++ b/src/modules/rlm_sql/rlm_sql.c
@@ -26,8 +26,7 @@
  */
 RCSID("$Id$")
 
-#define LOG_PREFIX "rlm_sql (%s) - "
-#define LOG_PREFIX_ARGS inst->name
+#define LOG_PREFIX inst->name
 
 #include <ctype.h>
 
diff --git a/src/modules/rlm_sql/sql.c b/src/modules/rlm_sql/sql.c
index 78e7b380c97..ae8bc1b9e6c 100644
--- a/src/modules/rlm_sql/sql.c
+++ b/src/modules/rlm_sql/sql.c
@@ -26,8 +26,7 @@
 
 RCSID("$Id$")
 
-#define LOG_PREFIX "rlm_sql (%s) - "
-#define LOG_PREFIX_ARGS inst->name
+#define LOG_PREFIX inst->name
 
 #include	<freeradius-devel/server/base.h>
 #include	<freeradius-devel/util/debug.h>
diff --git a/src/modules/rlm_sqlcounter/rlm_sqlcounter.c b/src/modules/rlm_sqlcounter/rlm_sqlcounter.c
index cac968b21da..ebd53d0e093 100644
--- a/src/modules/rlm_sqlcounter/rlm_sqlcounter.c
+++ b/src/modules/rlm_sqlcounter/rlm_sqlcounter.c
@@ -24,7 +24,7 @@
  */
 RCSID("$Id$")
 
-#define LOG_PREFIX "rlm_sqlcounter - "
+#define LOG_PREFIX "rlm_sqlcounter"
 
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/module.h>
diff --git a/src/modules/rlm_sqlippool/rlm_sqlippool.c b/src/modules/rlm_sqlippool/rlm_sqlippool.c
index 2d99e032a11..a92fb15b3fd 100644
--- a/src/modules/rlm_sqlippool/rlm_sqlippool.c
+++ b/src/modules/rlm_sqlippool/rlm_sqlippool.c
@@ -25,8 +25,7 @@
  */
 RCSID("$Id$")
 
-#define LOG_PREFIX "rlm_sql_ippool (%s) - "
-#define LOG_PREFIX_ARGS inst->sql_instance_name
+#define LOG_PREFIX inst->name
 
 #include <rlm_sql.h>
 #include <freeradius-devel/util/debug.h>
@@ -41,6 +40,7 @@ RCSID("$Id$")
  *	Define a structure for our module configuration.
  */
 typedef struct {
+	char const      *name;
 	char const	*sql_instance_name;
 
 	uint32_t	lease_duration;
@@ -397,6 +397,19 @@ finish:
 	return retval;
 }
 
+static int mod_bootstrap(void *instance, CONF_SECTION *conf)
+{
+	rlm_sqlippool_t	*inst = instance;
+	char const *name;
+
+	name = cf_section_name2(conf);
+	if (!name) name = cf_section_name1(conf);
+
+	inst->name = talloc_asprintf(inst, "%s - %s", name, inst->sql_instance_name);
+
+	return 0;
+}
+
 /*
  *	Do any per-module initialization that is separate to each
  *	configured instance of the module.  e.g. set up connections
@@ -850,6 +863,7 @@ module_t rlm_sqlippool = {
 	.type		= RLM_TYPE_THREAD_SAFE,
 	.inst_size	= sizeof(rlm_sqlippool_t),
 	.config		= module_config,
+	.bootstrap	= mod_bootstrap,
 	.instantiate	= mod_instantiate,
 	.methods = {
 		[MOD_ACCOUNTING]	= mod_accounting,
diff --git a/src/modules/rlm_test/rlm_test.c b/src/modules/rlm_test/rlm_test.c
index 1d8d39e4abe..c16ed511e0e 100644
--- 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 "rlm_test"
 
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/module.h>
diff --git a/src/modules/rlm_unbound/io.c b/src/modules/rlm_unbound/io.c
index aaf301f4a27..2f0de566517 100644
--- a/src/modules/rlm_unbound/io.c
+++ b/src/modules/rlm_unbound/io.c
@@ -24,7 +24,7 @@
  */
 RCSID("$Id$")
 
-#define LOG_PREFIX "rlm_unbound - "
+#define LOG_PREFIX "rlm_unbound"
 
 #include <freeradius-devel/server/log.h>
 #include <freeradius-devel/util/event.h>
diff --git a/src/modules/rlm_unbound/log.c b/src/modules/rlm_unbound/log.c
index 789ee12ce98..1000fd47122 100644
--- a/src/modules/rlm_unbound/log.c
+++ b/src/modules/rlm_unbound/log.c
@@ -24,7 +24,7 @@
  */
 RCSID("$Id$")
 
-#define LOG_PREFIX "rlm_unbound - "
+#define LOG_PREFIX "rlm_unbound"
 
 #include <freeradius-devel/util/syserror.h>
 #include "log.h"
diff --git a/src/modules/rlm_unbound/rlm_unbound.c b/src/modules/rlm_unbound/rlm_unbound.c
index dc4699fa747..ebedb21f65c 100644
--- 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 "rlm_unbound"
 
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/module.h>
diff --git a/src/modules/rlm_unix/rlm_unix.c b/src/modules/rlm_unix/rlm_unix.c
index 4cd9bb3eac2..337b95ec06d 100644
--- a/src/modules/rlm_unix/rlm_unix.c
+++ b/src/modules/rlm_unix/rlm_unix.c
@@ -30,8 +30,7 @@
 RCSID("$Id$")
 USES_APPLE_DEPRECATED_API
 
-#define LOG_PREFIX "rlm_unix (%s) - "
-#define LOG_PREFIX_ARGS inst->name
+#define LOG_PREFIX inst->name
 
 #include <freeradius-devel/radius/radius.h>
 #include <freeradius-devel/server/base.h>
diff --git a/src/modules/rlm_wimax/rlm_wimax.c b/src/modules/rlm_wimax/rlm_wimax.c
index c4d27a2fd31..cd16e972a79 100644
--- a/src/modules/rlm_wimax/rlm_wimax.c
+++ b/src/modules/rlm_wimax/rlm_wimax.c
@@ -24,7 +24,7 @@
 RCSID("$Id$")
 USES_APPLE_DEPRECATED_API	/* OpenSSL API has been deprecated by Apple */
 
-#define LOG_PREFIX "rlm_wimax - "
+#define LOG_PREFIX "rlm_wimax"
 
 #include <freeradius-devel/server/base.h>
 #include <freeradius-devel/server/module.h>
diff --git a/src/modules/rlm_yubikey/validate.c b/src/modules/rlm_yubikey/validate.c
index de56b5b1dc7..df9b0ed2516 100644
--- a/src/modules/rlm_yubikey/validate.c
+++ b/src/modules/rlm_yubikey/validate.c
@@ -7,8 +7,7 @@
  * @copyright 2013 The FreeRADIUS server project
  * @copyright 2013 Network RADIUS (legal@networkradius.com)
  */
-#define LOG_PREFIX "rlm_yubikey (%s) - "
-#define LOG_PREFIX_ARGS inst->name
+#define LOG_PREFIX inst->name
 
 #include "rlm_yubikey.h"
 
diff --git a/src/process/dhcpv4/base.c b/src/process/dhcpv4/base.c
index 6a549a0f13d..3b791063e69 100644
--- a/src/process/dhcpv4/base.c
+++ b/src/process/dhcpv4/base.c
@@ -22,7 +22,7 @@
  * @copyright 2018 The Freeradius server project.
  * @copyright 2018 Alan DeKok (aland@deployingradius.com)
  */
-#define LOG_PREFIX "process_dhcpv4 - "
+#define LOG_PREFIX "process_dhcpv4"
 
 #include <freeradius-devel/io/application.h>
 #include <freeradius-devel/server/protocol.h>