From 664f3a5ba818a3e84fbf3d0d5d11dbc0eaed6bea Mon Sep 17 00:00:00 2001 From: Gordon Crone Date: Tue, 17 Feb 2026 16:50:00 +0000 Subject: [PATCH 1/3] Play with making DFApplication a ManagedObject --- schema/appmodel/application.schema.xml | 6 +++++- src/DFApplication.cpp | 11 +++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/schema/appmodel/application.schema.xml b/schema/appmodel/application.schema.xml index 17c90bf..665bddc 100644 --- a/schema/appmodel/application.schema.xml +++ b/schema/appmodel/application.schema.xml @@ -80,7 +80,7 @@ - + @@ -105,12 +105,16 @@ + + + + diff --git a/src/DFApplication.cpp b/src/DFApplication.cpp index cc92959..e3dc2e6 100644 --- a/src/DFApplication.cpp +++ b/src/DFApplication.cpp @@ -189,6 +189,17 @@ fill_sourceid_object_from_app(const ConfigObjectFactory& obj_fac, sidNetObj.set_objs("source_ids", source_id_objs); } +std::set +DFApplication::object_tags() const { + std::set tags; + auto host = get_runs_on()->get_runs_on()->UID(); + for (auto writer : get_data_writers()) { + auto path = writer->get_data_store_params()->get_directory_path(); + tags.insert(host+"/"+path); + } + return tags; +} + void DFApplication::generate_modules(const confmodel::Session* session) const { From f614393fa4bf25ccd262663f926eda7d2dd891bd Mon Sep 17 00:00:00 2001 From: Gordon Crone Date: Tue, 24 Feb 2026 16:06:21 +0000 Subject: [PATCH 2/3] Make storage tag clearer --- src/DFApplication.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/DFApplication.cpp b/src/DFApplication.cpp index e3dc2e6..8e59818 100644 --- a/src/DFApplication.cpp +++ b/src/DFApplication.cpp @@ -195,7 +195,7 @@ DFApplication::object_tags() const { auto host = get_runs_on()->get_runs_on()->UID(); for (auto writer : get_data_writers()) { auto path = writer->get_data_store_params()->get_directory_path(); - tags.insert(host+"/"+path); + tags.insert("storage:"+host+":"+path); } return tags; } From 14ff463e17dcfea5f3373984d4f48cdfeae177b1 Mon Sep 17 00:00:00 2001 From: Gordon Crone Date: Fri, 17 Apr 2026 13:52:48 +0100 Subject: [PATCH 3/3] Avoid linter warning --- src/DFApplication.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/DFApplication.cpp b/src/DFApplication.cpp index c46946b..a08a2a6 100644 --- a/src/DFApplication.cpp +++ b/src/DFApplication.cpp @@ -123,7 +123,7 @@ DFApplication::object_tags() const { auto host = get_runs_on()->get_runs_on()->UID(); for (auto writer : get_data_writers()) { auto path = writer->get_data_store_params()->get_directory_path(); - tags.insert("storage:"+host+":"+path); + tags.insert(fmt::format("storage:{}:{}", host, path)); } return tags; }