X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fsave.c;h=2c38df97292fd34fc3619d0c8bdc20d15a1ac1d6;hb=da6c3a50492fd90c5dec03183ce504228292bb3b;hp=90b3a3b9c9d025a3e5ffff9fd670e322f9da4e42;hpb=d98ad589cd758f4a3167fb451a6e45d167b42942;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/save.c b/src/bin/lttng-sessiond/save.c
index 90b3a3b9c..2c38df972 100644
--- a/src/bin/lttng-sessiond/save.c
+++ b/src/bin/lttng-sessiond/save.c
@@ -1011,7 +1011,7 @@ end:
 
 static
 int save_ust_session(struct config_writer *writer,
-	struct ltt_session *session, int save_jul)
+	struct ltt_session *session, int save_agent)
 {
 	int ret;
 	struct ltt_ust_channel *ust_chan;
@@ -1023,7 +1023,7 @@ int save_ust_session(struct config_writer *writer,
 	assert(session);
 
 	ret = config_writer_write_element_string(writer, config_element_type,
-			save_jul ? config_domain_type_jul : config_domain_type_ust);
+			save_agent ? config_domain_type_jul : config_domain_type_ust);
 	if (ret) {
 		ret = LTTNG_ERR_SAVE_IO_FAIL;
 		goto end;
@@ -1053,11 +1053,12 @@ int save_ust_session(struct config_writer *writer,
 	rcu_read_lock();
 	cds_lfht_for_each_entry(session->ust_session->domain_global.channels->ht,
 			&iter.iter, node, node) {
-		int jul_channel;
+		int agent_channel;
 
 		ust_chan = caa_container_of(node, struct ltt_ust_channel, node);
-		jul_channel = !strcmp(DEFAULT_JUL_CHANNEL_NAME, ust_chan->name);
-		if (!(save_jul ^ jul_channel)) {
+		agent_channel = !strcmp(DEFAULT_JUL_CHANNEL_NAME, ust_chan->name) ||
+			!strcmp(DEFAULT_LOG4J_CHANNEL_NAME, ust_chan->name);
+		if (!(save_agent ^ agent_channel)) {
 			ret = save_ust_channel(writer, ust_chan, session->ust_session);
 			if (ret) {
 				rcu_read_unlock();
@@ -1139,7 +1140,7 @@ int save_domains(struct config_writer *writer, struct ltt_session *session)
 	}
 
 	if (session->ust_session &&
-		session->ust_session->domain_jul.being_used) {
+			lttng_ht_get_count(session->ust_session->agents) > 0) {
 		ret = config_writer_open_element(writer,
 			config_element_domain);
 		if (ret) {
@@ -1514,7 +1515,7 @@ int save_session(struct ltt_session *session,
 	}
 	file_opened = 1;
 
-	writer = config_writer_create(fd);
+	writer = config_writer_create(fd, 1);
 	if (!writer) {
 		ret = LTTNG_ERR_NOMEM;
 		goto end;