Skip to content
Snippets Groups Projects
Commit 3e9ffec2 authored by Jan David Mol's avatar Jan David Mol
Browse files

Task #7573: Configure pipeline.cfg such that no QPID feedback will be attempted if QPID is not used

parent cfa1baba
No related branches found
No related tags found
No related merge requests found
...@@ -2,4 +2,8 @@ ...@@ -2,4 +2,8 @@
lofar_package(Pipeline-Recipes 0.1) lofar_package(Pipeline-Recipes 0.1)
# The pipeline.cfg needs to know whether QPID is installed
include(LofarFindPackage)
lofar_find_package(QPID)
add_subdirectory(sip) add_subdirectory(sip)
...@@ -96,6 +96,13 @@ install(FILES ...@@ -96,6 +96,13 @@ install(FILES
${CMAKE_CURRENT_BINARY_DIR}/tasks.cfg ${CMAKE_CURRENT_BINARY_DIR}/tasks.cfg
DESTINATION share/pipeline) DESTINATION share/pipeline)
# PIPELINE_FEEDBACK_METHOD is used in pipeline.cfg.in to enable/disable qpid feedback
if(HAVE_QPID)
set(PIPELINE_FEEDBACK_METHOD "messagebus")
else(HAVE_QPID)
set(PIPELINE_FEEDBACK_METHOD "none")
endif(HAVE_QPID)
configure_file( configure_file(
${CMAKE_CURRENT_SOURCE_DIR}/pipeline.cfg.in ${CMAKE_CURRENT_SOURCE_DIR}/pipeline.cfg.in
${CMAKE_CURRENT_BINARY_DIR}/pipeline.cfg) ${CMAKE_CURRENT_BINARY_DIR}/pipeline.cfg)
......
...@@ -29,4 +29,4 @@ xml_stat_file = %(runtime_directory)s/%(job_name)s/logs/%(start_time)s/statistic ...@@ -29,4 +29,4 @@ xml_stat_file = %(runtime_directory)s/%(job_name)s/logs/%(start_time)s/statistic
# Valid options: # Valid options:
# messagebus Send feedback and status using LCS/MessageBus # messagebus Send feedback and status using LCS/MessageBus
# none Do NOT send feedback and status # none Do NOT send feedback and status
method = messagebus method = @PIPELINE_FEEDBACK_METHOD@
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment