Skip to content
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

Bump the actions group with 2 updates #2

Closed
wants to merge 6 commits into from
Closed

Bump the actions group with 2 updates #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
553dd92
Simplify main entrypoint
GDYendell Apr 26, 2024
ab1dd5e
Expose headers to HTTPConnection.get
GDYendell Apr 26, 2024
3026a59
Update introspection to use parameter tree query with metadata=true
GDYendell Apr 26, 2024
96a6b52
Add simple test that odin server output can be parsed
GDYendell Apr 26, 2024
ecdfbef
Add launch configs for development
GDYendell Apr 26, 2024
d31a6df
Bump the actions group with 2 updates
dependabot[bot] May 13, 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
2 changes: 1 addition & 1 deletion .github/workflows/_docs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:
if: github.ref_type == 'tag' || github.ref_name == 'main'
# We pin to the SHA, not the tag, for security reasons.
# https://docs.github.com/en/actions/learn-github-actions/security-hardening-for-github-actions#using-third-party-actions
uses: peaceiris/actions-gh-pages@373f7f263a76c20808c831209c920827a82a2847 # v3.9.3
uses: peaceiris/actions-gh-pages@4f9cc6602d3f66b9c108549d475ec49e8ef4d45e # v4.0.0
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
publish_dir: .github/pages
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/_release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
- name: Create GitHub Release
# We pin to the SHA, not the tag, for security reasons.
# https://docs.github.com/en/actions/learn-github-actions/security-hardening-for-github-actions#using-third-party-actions
uses: softprops/action-gh-release@9d7c94cfd0a1f3ed45544c887983e9fa900f0564 # v2.0.4
uses: softprops/action-gh-release@69320dbe05506a9a39fc8ae11030b214ec2d1f87 # v2.0.5
with:
prerelease: ${{ contains(github.ref_name, 'a') || contains(github.ref_name, 'b') || contains(github.ref_name, 'rc') }}
files: "*"
Expand Down
38 changes: 37 additions & 1 deletion .vscode/launch.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,42 @@
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"name": "Odin IOC",
"type": "debugpy",
"request": "launch",
"module": "odin_fastcs",
"justMyCode": false,
"console": "integratedTerminal",
"args": ["ioc", "ODIN"]
},
{
"name": "Odin Asyncio",
"type": "debugpy",
"request": "launch",
"module": "odin_fastcs",
"justMyCode": false,
"console": "integratedTerminal",
"args": ["asyncio"]
},
{
"name": "FrameProcessor",
"type": "debugpy",
"request": "launch",
"module": "odin.main",
"justMyCode": false,
"console": "integratedTerminal",
"args": ["--config", "${workspaceFolder}/dev/odin_server.cfg"]
},
{
"name": "Odin Control FP",
"type": "debugpy",
"request": "launch",
"module": "odin.main",
"justMyCode": false,
"console": "integratedTerminal",
"args": ["--config", "${workspaceFolder}/dev/odin_server.cfg"]
},
{
"name": "Debug Unit Test",
"type": "debugpy",
Expand All @@ -18,6 +54,6 @@
// Enable break on exception when debugging tests (see: tests/conftest.py)
"PYTEST_RAISE": "1",
},
}
},
]
}
140 changes: 140 additions & 0 deletions dev/fp1.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,140 @@
[
{
"fr_setup": {
"fr_ready_cnxn": "tcp://127.0.0.1:10001",
"fr_release_cnxn": "tcp://127.0.0.1:10002"
},
"meta_endpoint": "tcp://*:10008"
},
{
"plugin": {
"load": {
"index": "eiger",
"name": "EigerProcessPlugin",
"library": "/scratch/development/odin/eiger-detector/vscode_build/lib/libEigerProcessPlugin.so"
}
}
},
{
"plugin": {
"load": {
"index": "offset",
"name": "OffsetAdjustmentPlugin",
"library": "/scratch/development/odin/odin-data/vscode_build/lib/libOffsetAdjustmentPlugin.so"
}
}
},
{
"plugin": {
"load": {
"index": "param",
"name": "ParameterAdjustmentPlugin",
"library": "/scratch/development/odin/odin-data/vscode_build/lib/libParameterAdjustmentPlugin.so"
}
}
},
{
"plugin": {
"load": {
"index": "hdf",
"name": "FileWriterPlugin",
"library": "/scratch/development/odin/odin-data/vscode_build/lib/libHdf5Plugin.so"
}
}
},
{
"plugin": {
"connect": {
"index": "eiger",
"connection": "frame_receiver"
}
}
},
{
"plugin": {
"connect": {
"index": "offset",
"connection": "eiger"
}
}
},
{
"plugin": {
"connect": {
"index": "param",
"connection": "offset"
}
}
},
{
"plugin": {
"connect": {
"index": "hdf",
"connection": "param"
}
}
},
{
"hdf": {
"dataset": {
"compressed_size": {
"datatype": "uint32",
"chunks": [1000]
}
}
}
},
{
"hdf": {
"dataset": {
"uid": {
"datatype": "uint64",
"chunks": [1000]
}
}
}
},
{
"param": {
"parameter": {
"uid": {
"adjustment": 1
}
}
}
},
{
"hdf": {
"process": {
"number": 4,
"rank": 0
}
}
},
{
"hdf": {
"file": {
"flush_error_duration": 10000,
"write_error_duration": 10000,
"close_error_duration": 10000,
"create_error_duration": 10000
}
}
},
{
"hdf": {
"file": {
"first_number": 1
}
}
},
{
"hdf": {
"dataset": {
"data": {
"indexes": true
}
}
}
}
]
75 changes: 75 additions & 0 deletions dev/log4cxx.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
<?xml version="1.0" encoding="UTF-8" ?>
<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">

<!-- Output the log message to system console -->
<appender name="ApplicationConsoleAppender" class="org.apache.log4j.ConsoleAppender">
<param name="Target" value="System.out" />
<param name="Threshold" value="INFO"/>
<layout class="org.apache.log4j.PatternLayout">
<param name="ConversionPattern" value="%F:%L:%n %d{HH:mm:ss,SSS} %-14c %-5p - %m%n"/>
</layout>
</appender>

<appender name="FileWriterAppender" class="org.apache.log4j.FileAppender">
<param name="file" value="OdinData.log" />
<param name="append" value="false" />
<layout class="org.apache.log4j.PatternLayout">
<param name="ConversionPattern" value="%F:%L - %d{HH:mm:ss,SSS} %-14c %-5p - %m%n" />
</layout>
</appender>

<appender name="graylog" class="org.apache.log4j.net.SyslogAppender">
<param name="Facility" value="LOCAL1"/>
<param name="SyslogHost" value="graylog-log-target.diamond.ac.uk:12211"/>
<param name="Threshold" value="INFO"/>
<layout class="org.apache.log4j.PatternLayout">
<!-- syslog standard RFC 5424 formatting. Unfortunately the log4cxx SyslogAppender does not do this automatically -->
<param name="ConversionPattern" value="1 %d{yyyy-MM-ddTHH:mm:ss.SSS} %X{host} %X{app} %X{pid} - [dlsdaq@32121 logger_name=&quot;%c&quot; log_level=&quot;%p&quot; thread=&quot;%X{thread}&quot; username=&quot;%X{user}&quot; file_line=&quot;%F:%L&quot; beamline=&quot;iXX&quot; detector=&quot;Eiger16M&quot;] %m%n" />
</layout>
</appender>

<!-- all of the loggers inherit settings from the root and print to stdout -->
<root>
<priority value="all" />
<appender-ref ref="ApplicationConsoleAppender" />
</root>

<!-- The FrameProcessor applications logger hierarchy -->
<logger name="FP">
<priority value="all" />
<appender-ref ref="graylog" />
</logger>
<logger name="FP.App"></logger>
<logger name="FP.FrameProcessorController"></logger>
<logger name="FP.DataBlock"></logger>
<logger name="FP.DataBlockPool"></logger>
<logger name="FP.FrameProcessorPlugin"></logger>
<logger name="FP.FileWriterPlugin"></logger>
<logger name="FP.Acquisition"></logger>
<logger name="FP.HDF5File"></logger>
<!-- Detector-specific plugins -->
<logger name="FP.EigerProcessPlugin"></logger>
<logger name="FP.ExcaliburProcessPlugin"></logger>
<logger name="FP.LATRDProcessPlugin"></logger>

<!-- The FrameReceiver applications logger hierarchy -->
<logger name="FR">
<priority value="all" />
<appender-ref ref="graylog" />
</logger>
<logger name="FR.App"></logger>
<!-- Detector-specific plugins -->
<logger name="FR.EigerFrameDecoder"></logger>
<logger name="FR.ExcaliburFrameDecoder"></logger>
<logger name="FR.LATRDDecoderPlugin"></logger>

<!-- The Eiger Detector applications logger hierarchy -->
<logger name="ED">
<priority value="all" />
<appender-ref ref="graylog" />
</logger>
<logger name="ED.UnitTest"></logger>
<logger name="ED.APP"></logger>
<logger name="ED.EigerFan"></logger>

</log4j:configuration>
17 changes: 17 additions & 0 deletions dev/odin_server.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
[server]
debug_mode = 1
http_port = 8888
http_addr = 127.0.0.1
static_path = ./static
adapters = od_fps, fp

[tornado]
logging = debug

[adapter.od_fps]
module = odin_data.control.odin_data_adapter.OdinDataAdapter
endpoints = 127.0.0.1:10004
update_interval = 0.2

[adapter.fp]
module = odin_data.control.frame_processor_adapter.FrameProcessorAdapter
Loading
Loading