X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Faction-executor.c;h=9a89865a930c142e395f134d6fb23303b3d3508d;hb=c7627a89bbd6696a667acf0f52cc8a4fe876d3f1;hp=aa55782e2ded7b8fb68e4eec7e9395e7fab8baa8;hpb=ad63a966ae7a204528fa77599f92100d7341be7a;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/action-executor.c b/src/bin/lttng-sessiond/action-executor.c
index aa55782e2..9a89865a9 100644
--- a/src/bin/lttng-sessiond/action-executor.c
+++ b/src/bin/lttng-sessiond/action-executor.c
@@ -206,7 +206,16 @@ static const char *get_trigger_name(const struct lttng_trigger *trigger)
 	enum lttng_trigger_status trigger_status;
 
 	trigger_status = lttng_trigger_get_name(trigger, &trigger_name);
-	assert(trigger_status == LTTNG_TRIGGER_STATUS_OK);
+	switch (trigger_status) {
+	case LTTNG_TRIGGER_STATUS_OK:
+		break;
+	case LTTNG_TRIGGER_STATUS_UNSET:
+		trigger_name = "(anonymous)";
+		break;
+	default:
+		trigger_name = "(failed to get name)";
+		break;
+	}
 
 	return trigger_name;
 }
@@ -772,17 +781,7 @@ static void *action_executor_thread(void *_data)
 			uid_t trigger_owner_uid;
 			enum lttng_trigger_status trigger_status;
 
-			trigger_status = lttng_trigger_get_name(
-					work_item->trigger, &trigger_name);
-			switch (trigger_status) {
-			case LTTNG_TRIGGER_STATUS_OK:
-				break;
-			case LTTNG_TRIGGER_STATUS_UNSET:
-				trigger_name = "(unset)";
-				break;
-			default:
-				abort();
-			}
+			trigger_name = get_trigger_name(work_item->trigger);
 
 			trigger_status = lttng_trigger_get_owner_uid(
 					work_item->trigger, &trigger_owner_uid);