X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fevent.c;h=181926b415f3e2ed9b50fcb35f25d60d515e48e5;hb=9b22d135a4586b0c859d3d4c734090a1954930d9;hp=099cbd18db8ea42d767951f094df5dfd81856fbe;hpb=6e911cad03751b6814fddd65b19a592acdc2b7b7;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/event.c b/src/bin/lttng-sessiond/event.c
index 099cbd18d..181926b41 100644
--- a/src/bin/lttng-sessiond/event.c
+++ b/src/bin/lttng-sessiond/event.c
@@ -715,26 +715,31 @@ const char *event_get_default_agent_ust_name(enum lttng_domain_type domain)
 {
 	const char *default_event_name = NULL;
 
-	if (domain == LTTNG_DOMAIN_JUL) {
+	switch (domain) {
+	case LTTNG_DOMAIN_LOG4J:
 		if (is_root) {
-			default_event_name = DEFAULT_SYS_JUL_EVENT_NAME;
+			default_event_name = DEFAULT_SYS_LOG4J_EVENT_NAME;
 		} else {
-			default_event_name = DEFAULT_USER_JUL_EVENT_NAME;
+			default_event_name = DEFAULT_USER_LOG4J_EVENT_NAME;
 		}
-	} else if (domain == LTTNG_DOMAIN_LOG4J) {
+		break;
+	case LTTNG_DOMAIN_JUL:
 		if (is_root) {
-			default_event_name = DEFAULT_SYS_LOG4J_EVENT_NAME;
+			default_event_name = DEFAULT_SYS_JUL_EVENT_NAME;
 		} else {
-			default_event_name = DEFAULT_USER_LOG4J_EVENT_NAME;
+			default_event_name = DEFAULT_USER_JUL_EVENT_NAME;
 		}
-	} else {
+		break;
+	case LTTNG_DOMAIN_PYTHON:
+		default_event_name = DEFAULT_USER_PYTHON_EVENT_NAME;
+		break;
+	default:
 		assert(0);
 	}
 
 	return default_event_name;
 }
 
-
 /*
  * Disable a single agent event for a given UST session.
  *
@@ -770,6 +775,8 @@ int event_agent_disable(struct ltt_ust_session *usess, struct agent *agt,
 		ust_channel_name = DEFAULT_JUL_CHANNEL_NAME;
 	} else if (agt->domain == LTTNG_DOMAIN_LOG4J) {
 		ust_channel_name = DEFAULT_LOG4J_CHANNEL_NAME;
+	} else if (agt->domain == LTTNG_DOMAIN_PYTHON) {
+		ust_channel_name = DEFAULT_PYTHON_CHANNEL_NAME;
 	} else {
 		ret = LTTNG_ERR_INVALID;
 		goto error;