Skip to content

Add in doc source files after save restore pref file #2927 PR #2928

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
tynanford wants to merge 2 commits into from
Closed

Add in doc source files after save restore pref file #2927 PR #2928

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
653a39d
Add in doc source files after save restore pref file #2927 PR
tynanford Jan 29, 2024
5ca066e
revert changes to applications.rst and services.rst
tynanford Jan 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion docs/source/preference_properties.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down