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;
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;
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();
}
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) {
}
file_opened = 1;
- writer = config_writer_create(fd);
+ writer = config_writer_create(fd, 1);
if (!writer) {
ret = LTTNG_ERR_NOMEM;
goto end;
goto end;
}
} else {
- ret = config_writer_write_element_signed_int(writer,
+ ret = config_writer_write_element_unsigned_int(writer,
config_element_live_timer_interval, session->live_timer);
if (ret) {
ret = LTTNG_ERR_SAVE_IO_FAIL;