Merge branch 'logging_changes' of https://github.com/adam-bishop/trust_router

Pull in two additional fixes from Adam.

diff --git a/common/tr_debug.c b/common/tr_debug.c
index 874b595..6f4fc6e 100644 (file)
--- a/common/tr_debug.c
+++ b/common/tr_debug.c
@@ -231,8 +231,6 @@ void tr_log_close() {
 
 void tr_log(const int sev, const char *fmt, ...) {
 
-  tr_log_open();
-
   if (NULL != fmt) {
 
     va_list ap;
@@ -252,8 +250,6 @@ void tr_log(const int sev, const char *fmt, ...) {
 
 void tr_audit_resp(TID_RESP *resp) {
 
-  tr_log_open();
-
   if (NULL != resp) {
 
     char *attrs[] = { audit_fmt("result", resp->result ? "error" : "success"),
@@ -278,8 +274,6 @@ void tr_audit_resp(TID_RESP *resp) {
 
 void tr_audit_req(TID_REQ *req) {
 
-  tr_log_open();
-
   if (NULL != req) {
 
     char *attrs[] = { audit_fmt("comm", NULL != req->comm ? req->comm->buf : NULL),

diff --git a/tid/example/tidc_main.c b/tid/example/tidc_main.c
index 9f27018..7050eb8 100644 (file)
--- a/tid/example/tidc_main.c
+++ b/tid/example/tidc_main.c
@@ -99,6 +99,9 @@ int main (int argc,
   int rc;
   gss_ctx_id_t gssctx;
 
+  /* Use standalone logging */
+  tr_log_open();
+
   /* set logging levels */
   talloc_set_log_stderr();
   tr_log_threshold(LOG_CRIT);

diff --git a/tid/example/tids_main.c b/tid/example/tids_main.c
index 313e457..ce434ae 100644 (file)
--- a/tid/example/tids_main.c
+++ b/tid/example/tids_main.c
@@ -279,6 +279,9 @@ int main (int argc,
     exit(1);
   }
 
+  /* Use standalone logging */
+  tr_log_open();
+
   /* set logging levels */
   tr_log_threshold(LOG_CRIT);
   tr_console_threshold(LOG_DEBUG);

diff --git a/tr/tr_main.c b/tr/tr_main.c
index ae662fa..dc18ca0 100644 (file)
--- a/tr/tr_main.c
+++ b/tr/tr_main.c
@@ -259,6 +259,9 @@ int main (int argc, const char *argv[])
 
   /* parse command-line arguments? -- TBD */
 
+  /* Use standalone logging */
+  tr_log_open();
+
   /* create a Trust Router instance */
   if (NULL == (tr = tr_create())) {
     tr_crit("Unable to create Trust Router instance, exiting.");