Skip to content

Commit

Permalink
Remove catalog_process from the workflow graph (#177)
Browse files Browse the repository at this point in the history
Fix typos and update service dependency graph

Signed-off-by: Jose Borreguero <[email protected]>
  • Loading branch information
jmborr authored Aug 28, 2024
1 parent 8409e9c commit da38a73
Show file tree
Hide file tree
Showing 5 changed files with 3 additions and 10 deletions.
2 changes: 1 addition & 1 deletion Dockerfile.webmonchow
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Binary file modified docs/developer/images/services_dependence_graph.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 0 additions & 7 deletions docs/developer/images/services_dependence_graph.puml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion docs/developer/instruction/add_instrument.rst
Original file line number Diff line number Diff line change
@@ -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 <https://webmonchow.readthedocs.io/en/latest/user/index.html#adding-a-new-instrument>`_.
2 changes: 1 addition & 1 deletion docs/developer/instruction/test_fixture.rst
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ This is given a fake filesystem with the contents of ``tests/data`` in the locat

`webmonchow fixture <https://webmonchow.readthedocs.io/en/latest/index.html>`_
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.

0 comments on commit da38a73

Please sign in to comment.