better logging

1 files changed, 24 insertions, 21 deletions

diff --git a/src/gnutls_hooks.c b/src/gnutls_hooks.c
index 54b0a83..57d3aaf 100644
--- a/src/gnutls_hooks.c
+++ b/src/gnutls_hooks.c
@@ -54,6 +54,9 @@ static void gnutls_debug_log_all(int level, const char *str)
 {
     apr_file_printf(debug_log_fp, "<%d> %s\n", level, str);
 }
+#define _gnutls_log apr_file_printf
+#else
+# define _gnutls_log(...) 
 #endif
 
 int
@@ -67,11 +70,11 @@ int ret;
                   APR_APPEND | APR_WRITE | APR_CREATE, APR_OS_DEFAULT,
                   pconf);
 
-    apr_file_printf(debug_log_fp, "%s: %d\n", __func__, __LINE__);
+    _gnutls_log(debug_log_fp, "%s: %d\n", __func__, __LINE__);
 
     gnutls_global_set_log_level(9);
     gnutls_global_set_log_function(gnutls_debug_log_all);
-    apr_file_printf(debug_log_fp, "gnutls: %s\n", gnutls_check_version(NULL));
+    _gnutls_log(debug_log_fp, "gnutls: %s\n", gnutls_check_version(NULL));
 #endif
 
 #if APR_HAS_THREADS
@@ -84,14 +87,14 @@ int ret;
 #endif
 
     if (gnutls_check_version(LIBGNUTLS_VERSION)==NULL) {
-        apr_file_printf(debug_log_fp, "gnutls_check_version() failed. Required: gnutls-%s Found: gnutls-%s\n", 
+        _gnutls_log(debug_log_fp, "gnutls_check_version() failed. Required: gnutls-%s Found: gnutls-%s\n", 
           LIBGNUTLS_VERSION, gnutls_check_version(NULL));
         return -3;
     }
 
     ret = gnutls_global_init();
     if (ret < 0) {
-        apr_file_printf(debug_log_fp, "gnutls_global_init: %s\n", gnutls_strerror(ret));
+        _gnutls_log(debug_log_fp, "gnutls_global_init: %s\n", gnutls_strerror(ret));
         return -3;
     }
 
@@ -109,7 +112,7 @@ static int mgs_select_virtual_server_cb(gnutls_session_t session)
     int ret;
     int cprio[2];
 
-    apr_file_printf(debug_log_fp, "%s: %d\n", __func__, __LINE__);
+    _gnutls_log(debug_log_fp, "%s: %d\n", __func__, __LINE__);
 
     ctxt = gnutls_transport_get_ptr(session);
 
@@ -167,7 +170,7 @@ static int cert_retrieve_fn(gnutls_session_t session, gnutls_retr_st * ret)