X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=tr%2Ftr_main.c;fp=tr%2Ftr_main.c;h=7fad36fdf3853193a591d612c24800a6171e9797;hb=2664b9de04d265fc028e07ffcf5f0d8b42523fb5;hp=86fb8a93e2d5bda2dfc285e6a83cac78780e42e7;hpb=cdb5040af341d3523dd78d7dd1546094d2c5db6f;p=trust_router.git

diff --git a/tr/tr_main.c b/tr/tr_main.c
index 86fb8a9..7fad36f 100644
--- a/tr/tr_main.c
+++ b/tr/tr_main.c
@@ -40,6 +40,8 @@
 #include <signal.h>
 
 #include <tid_internal.h>
+#include <mon_internal.h>
+#include <tr_mon.h>
 #include <tr_tid.h>
 #include <tr_trp.h>
 #include <tr_config.h>
@@ -150,7 +152,7 @@ int main(int argc, char *argv[])
   struct cmdline_args opts;
   struct event_base *ev_base;
   struct tr_socket_event tids_ev = {0};
-//  struct tr_socket_event mon_ev = {0};
+  struct tr_socket_event mon_ev = {0};
   struct event *cfgwatch_ev;
 
   configure_signals();
@@ -201,11 +203,14 @@ int main(int argc, char *argv[])
     return 1;
   }
 
-//  /***** initialize the monitoring interface instance *****/
-//  if (NULL == (tr->mons = mons_new(tr))) {
-//    tr_crit("Error initializing monitoring interface instance.");
-//    return 1;
-//  }
+  /***** initialize the monitoring interface instance *****/
+  if (NULL == (tr->mons = mons_new(tr))) {
+    tr_crit("Error initializing monitoring interface instance.");
+    return 1;
+  }
+  /* Monitor our tids/trps instances */
+  tr->mons->tids = tr->tids;
+  tr->mons->trps = tr->trps;
 
   /***** process configuration *****/
   tr->cfgwatch=tr_cfgwatch_create(tr);
@@ -235,12 +240,12 @@ int main(int argc, char *argv[])
     return 1;
   }
 
-//  /* install monitoring interface events */
-//  tr_debug("Initializing monitoring interface events.");
-//  if (0 != tr_mon_event_init(tr->mons, ev_base, &mon_ev)) {
-//    tr_crit("Error initializing monitoring interface.");
-//    return 1;
-//  }
+  /* install monitoring interface events */
+  tr_debug("Initializing monitoring interface events.");
+  if (0 != tr_mons_event_init(ev_base, tr->mons, tr->cfg_mgr, &mon_ev)) {
+    tr_crit("Error initializing monitoring interface.");
+    return 1;
+  }
 
   /* install TID server events */
   tr_debug("Initializing TID server events.");