From 653a39d1c011ce2507c940b696dac96e481d54f8 Mon Sep 17 00:00:00 2001 From: Tynan Ford Date: Mon, 29 Jan 2024 11:50:59 -0800 Subject: [PATCH 1/2] Add in doc source files after save restore pref file #2927 PR --- docs/source/applications.rst | 34 +++++++++++++-------------- docs/source/preference_properties.rst | 15 +++++++++++- docs/source/services.rst | 6 ++--- 3 files changed, 34 insertions(+), 21 deletions(-) diff --git a/docs/source/applications.rst b/docs/source/applications.rst index 3ef06e77ac..e95ed5472f 100644 --- a/docs/source/applications.rst +++ b/docs/source/applications.rst @@ -7,27 +7,27 @@ The following sections describe details of specific application features. .. toctree:: :maxdepth: 1 - core/ui/doc/index - core/pv/doc/index - core/framework/doc/index core/formula/doc/index - app/perfmon/doc/index - app/credentials-management/doc/index - app/errlog/doc/index - app/update/doc/index - app/logbook/olog/ui/doc/index - app/databrowser/doc/index + core/framework/doc/index + core/pv/doc/index + core/ui/doc/index app/3d-viewer/doc/index - app/pace/doc/index - app/log-configuration/doc/index - app/save-and-restore/app/doc/index + app/alarm/datasource/doc/index + app/alarm/logging-ui/doc/index + app/alarm/ui/doc/index app/channel/views/doc/index - app/imageviewer/doc/index - app/display/navigation/doc/index + app/credentials-management/doc/index + app/databrowser/doc/index app/display/convert-medm/doc/index app/display/editor/doc/index + app/display/navigation/doc/index + app/errlog/doc/index + app/imageviewer/doc/index + app/log-configuration/doc/index + app/logbook/olog/ui/doc/index + app/pace/doc/index + app/perfmon/doc/index app/pvtable/doc/index - app/alarm/ui/doc/index - app/alarm/datasource/doc/index - app/alarm/logging-ui/doc/index app/pvtree/doc/index + app/save-and-restore/app/doc/index + app/update/doc/index diff --git a/docs/source/preference_properties.rst b/docs/source/preference_properties.rst index 8a770612aa..39430ceafb 100644 --- a/docs/source/preference_properties.rst +++ b/docs/source/preference_properties.rst @@ -21,7 +21,7 @@ File ../../app/alarm/model/src/main/resources/alarm_preferences.properties:: # Kafka Server host:port server=localhost:9092 - # A file to configure the properites of kafka clients + # A file to configure the properties of kafka clients kafka_properties= # Name of alarm tree root. @@ -156,6 +156,9 @@ File ../../app/alarm/model/src/main/resources/alarm_preferences.properties:: # # Format: M1=Value1, M2=Value2 macros=TOP=/home/controls/displays,WEBROOT=http://localhost/controls/displays + + # Max time in ms a producer call will block. + max_block_ms=10000 alarm.logging.ui @@ -1439,6 +1442,16 @@ File ../../app/save-and-restore/app/src/main/resources/save_and_restore_preferen # If declared add a date automatically in the name of the snapshot "Take Snapshot" #default_snapshot_name_date_format=yyyy-MM-dd HH:mm:ss + + +saveandrestore.client +--------------------- + +File ../../app/save-and-restore/app/src/main/resources/save_and_restore_client_preferences.properties:: + + # ------------------------------------------------------ + # Package org.phoebus.applications.saveandrestore.client + # ------------------------------------------------------ # The URL to the save-and-restore service jmasar.service.url=http://localhost:8080/save-restore diff --git a/docs/source/services.rst b/docs/source/services.rst index 926c8fe3f1..80e780b0d0 100644 --- a/docs/source/services.rst +++ b/docs/source/services.rst @@ -7,8 +7,8 @@ The following sections describe available services. .. toctree:: :maxdepth: 1 - services/archive-engine/doc/index services/alarm-config-logger/doc/index - services/save-and-restore/doc/index - services/alarm-server/doc/index services/alarm-logger/doc/index + services/alarm-server/doc/index + services/archive-engine/doc/index + services/save-and-restore/doc/index From 5ca066ec8f142a5620f538f2f909113cba7a054d Mon Sep 17 00:00:00 2001 From: Tynan Ford Date: Mon, 29 Jan 2024 16:06:19 -0800 Subject: [PATCH 2/2] revert changes to applications.rst and services.rst --- docs/source/applications.rst | 34 +++++++++++++++++----------------- docs/source/services.rst | 6 +++--- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/docs/source/applications.rst b/docs/source/applications.rst index e95ed5472f..3ef06e77ac 100644 --- a/docs/source/applications.rst +++ b/docs/source/applications.rst @@ -7,27 +7,27 @@ The following sections describe details of specific application features. .. toctree:: :maxdepth: 1 - core/formula/doc/index - core/framework/doc/index - core/pv/doc/index core/ui/doc/index - app/3d-viewer/doc/index - app/alarm/datasource/doc/index - app/alarm/logging-ui/doc/index - app/alarm/ui/doc/index - app/channel/views/doc/index + core/pv/doc/index + core/framework/doc/index + core/formula/doc/index + app/perfmon/doc/index app/credentials-management/doc/index - app/databrowser/doc/index - app/display/convert-medm/doc/index - app/display/editor/doc/index - app/display/navigation/doc/index app/errlog/doc/index - app/imageviewer/doc/index - app/log-configuration/doc/index + app/update/doc/index app/logbook/olog/ui/doc/index + app/databrowser/doc/index + app/3d-viewer/doc/index app/pace/doc/index - app/perfmon/doc/index + app/log-configuration/doc/index + app/save-and-restore/app/doc/index + app/channel/views/doc/index + app/imageviewer/doc/index + app/display/navigation/doc/index + app/display/convert-medm/doc/index + app/display/editor/doc/index app/pvtable/doc/index + app/alarm/ui/doc/index + app/alarm/datasource/doc/index + app/alarm/logging-ui/doc/index app/pvtree/doc/index - app/save-and-restore/app/doc/index - app/update/doc/index diff --git a/docs/source/services.rst b/docs/source/services.rst index 80e780b0d0..926c8fe3f1 100644 --- a/docs/source/services.rst +++ b/docs/source/services.rst @@ -7,8 +7,8 @@ The following sections describe available services. .. toctree:: :maxdepth: 1 - services/alarm-config-logger/doc/index - services/alarm-logger/doc/index - services/alarm-server/doc/index services/archive-engine/doc/index + services/alarm-config-logger/doc/index services/save-and-restore/doc/index + services/alarm-server/doc/index + services/alarm-logger/doc/index