diff --git a/Dockerfile.webmonchow b/Dockerfile.webmonchow index a3adc5b4..67d33d2c 100644 --- a/Dockerfile.webmonchow +++ b/Dockerfile.webmonchow @@ -7,7 +7,7 @@ RUN conda install --yes --solver=libmamba -n base -c conda-forge -c neutrons pos # Install webmonchow from a feature branch (only to test the latest changes in webmonchow) # RUN conda install --yes --solver=libmamba -n base -c conda-forge postgresql=14 -#RUN python -m pip install git+https://github.com/neutrons/webmonchow.git@next#egg=webmonchow +# RUN python -m pip install git+https://github.com/neutrons/webmonchow.git@next#egg=webmonchow # Start the AMQ and PV generators when starting the container CMD ["sh", "-c", "broadcast_pv & broadcast_amq --broker \"activemq:61613\" & wait"] diff --git a/docs/developer/images/services_dependence_graph.png b/docs/developer/images/services_dependence_graph.png index 02377625..3f894f7c 100644 Binary files a/docs/developer/images/services_dependence_graph.png and b/docs/developer/images/services_dependence_graph.png differ diff --git a/docs/developer/images/services_dependence_graph.puml b/docs/developer/images/services_dependence_graph.puml index 63569144..ac51b9a0 100644 --- a/docs/developer/images/services_dependence_graph.puml +++ b/docs/developer/images/services_dependence_graph.puml @@ -9,26 +9,19 @@ queue activemq cloud webmon component dasmon component workflow -agent catalog_process hexagon nginx agent autoreducer webmonchow -right-> db webmonchow -right-> activemq - webmon -down-> db - -catalog_process -right-> nginx dasmon -down-> webmon nginx -down-> webmon workflow -right-> webmon - workflow -down-> activemq dasmon -down-> activemq autoreducer -down-> activemq activemq -down-> autoreducer webmon -up-> activemq -catalog_process -right-> activemq -activemq -right-> catalog_process @enduml diff --git a/docs/developer/instruction/add_instrument.rst b/docs/developer/instruction/add_instrument.rst index f7aed848..98fd0065 100644 --- a/docs/developer/instruction/add_instrument.rst +++ b/docs/developer/instruction/add_instrument.rst @@ -1,6 +1,6 @@ Adding a New Instrument for Testing in the Local Deployment ========================================================== -When building the local deployment, the wellcome page http://localhost/dasmon/ shows a list of instruments. +When building the local deployment, the welcome page http://localhost/dasmon/ shows a list of instruments. Adding a new instrument is done in the `webmonchow repository `_. diff --git a/docs/developer/instruction/test_fixture.rst b/docs/developer/instruction/test_fixture.rst index 646eb6c3..db22cc49 100644 --- a/docs/developer/instruction/test_fixture.rst +++ b/docs/developer/instruction/test_fixture.rst @@ -17,7 +17,7 @@ This is given a fake filesystem with the contents of ``tests/data`` in the locat `webmonchow fixture `_ creates pretend messages associated with runs being saved, -as well as fake process variables (PVs) that the data aquisition would make. +as well as fake process variables (PVs) that the data acquisition would make. ``catalog_process`` fixture is running the script located in ``src/catalog/catalog_process.py`` which responds with the messages in a similar way to how ONCAT would. The script creates a :py:obj:`~catalog_process.Listener` and responds accordingly.