Skip to content

Commit 033cb06

Browse files
committed
changed path to readout-defaults.cfg
1 parent 9ffedc8 commit 033cb06

File tree

6 files changed

+8
-5
lines changed

6 files changed

+8
-5
lines changed

doc/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ The configuration source is provided as a startup argument (see 'Usage' below).
124124

125125
Some of the configuration parameters may be overwritten at runtime by OCC, when readout is launched from AliECS. For example, the FairMQ parameters for the StfBuilder connection are set dynamically in the configure step. This is done for the consumer with matching `fmq-name=readout`.
126126

127-
Some of the configuration parameters may be loaded on startup from `/etc/o2.d/readout-defaults`.
127+
Some of the configuration parameters may be loaded on startup from `/etc/o2.d/readout/readout-defaults.cfg`.
128128

129129

130130
#### File syntax

doc/configurationParameters.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ They can be reloaded several time during the lifetime of the process.
1111

1212
# Readout defaults (1)
1313

14-
These are defined in local file `/etc/o2.d/readout-default.cfg`, which is loaded on `o2-readout-exe` startup (if the file exists). They are valid for the lifetime of the o2-readout-exe process. There is usually no need for users to edit these settings. The file format is '.ini' style, with `[sections]` and `key=value` pairs.
14+
These are defined in local file `/etc/o2.d/readout/readout-defaults.cfg`, which is loaded on `o2-readout-exe` startup (if the file exists). They are valid for the lifetime of the o2-readout-exe process. There is usually no need for users to edit these settings. The file format is '.ini' style, with `[sections]` and `key=value` pairs.
1515

1616
Following table describes the parameters of the `[readout]` section.
1717

doc/howto.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ fileName=/tmp/data_%f.raw
2020

2121
## How to launch custom commands on start/stop
2222

23-
First, custom command shells must be enabled in the default readout settings `/etc/o2.d/readout-defaults.cfg`:
23+
First, custom command shells must be enabled in the default readout settings `/etc/o2.d/readout/readout-defaults.cfg`:
2424
```
2525
[readout]
2626
...

doc/releaseNotes.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -652,3 +652,6 @@ This file describes the main feature changes for each readout.exe released versi
652652
## v2.27.0 - 21/01/2025
653653
- Added symbolic links with relative path in configuration. See @LINK syntax.
654654
- Fixed o2-readout-config-generator for RHEL9 compatibility.
655+
656+
## next
657+
- Path of configuration file from which defaults are loaded on startup has been changed to /etc/o2.d/readout/readout-defaults.cfg (it was in /etc/o2.d before, now changing to standard subdirectory location).

src/ReadoutConst.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@
1313

1414
#pragma once
1515

16-
const std::string cfgDefaultsPath = "file:/etc/o2.d/readout-defaults.cfg"; // path to default configuration file
16+
const std::string cfgDefaultsPath = "file:/etc/o2.d/readout/readout-defaults.cfg"; // path to default configuration file

src/readoutStatus.tcl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# [readout-monitor]
77
# outputFormat=1
88

9-
set configFile "/etc/o2.d/readout-defaults.cfg"
9+
set configFile "/etc/o2.d/readout/readout-defaults.cfg"
1010
set configSection "readout-monitor"
1111

1212
# defaults

0 commit comments

Comments
 (0)