Adding log4j agent support

[lttng-tools.git] / src / common / mi-lttng.c

diff --git a/src/common/mi-lttng.c b/src/common/mi-lttng.c
index 9c98a0dd7712ce589347e0bbd0a285168a6575e5..fc7207cb4137a1f9317a2525b20e38cce2c34ef8 100644 (file)
--- a/src/common/mi-lttng.c
+++ b/src/common/mi-lttng.c
@@ -305,6 +305,8 @@ const char *mi_lttng_domaintype_string(enum lttng_domain_type value)
                return config_domain_type_ust;
        case LTTNG_DOMAIN_JUL:
                return config_domain_type_jul;
+       case LTTNG_DOMAIN_LOG4J:
+               return config_domain_type_log4j;
        default:
                /* Should not have an unknown domain */
                assert(0);
@@ -489,7 +491,7 @@ int mi_lttng_version(struct mi_writer *writer, struct mi_lttng_version *version,
 
        /* Version string (contain info like rc etc.) */
        ret = mi_lttng_writer_write_element_string(writer,
-                       mi_lttng_element_version_str, VERSION);
+                       mi_lttng_element_version_str, version->version);
        if (ret) {
                goto end;
        }
@@ -661,7 +663,11 @@ int mi_lttng_domain(struct mi_writer *writer,
                goto end;
        }
 
-       /* TODO: attr... not sure how to use the union.... */
+       /* TODO: union  attr
+        * This union is not currently used and was added for
+        * future ust domain support.
+        * Date: 25-06-2014
+        * */
 
        if (!is_open) {
                /* Closing domain element */