Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
S
Stingray
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Jira
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
LOFAR2.0
Stingray
Commits
c13bd6cc
Commit
c13bd6cc
authored
2 weeks ago
by
Hannes Feldt
Browse files
Options
Downloads
Plain Diff
Merge branch '
L2SS-1914
-fix_s3_packet_loader' into 'main'
L2SS-1914
: Fix S3 packet loader Closes
L2SS-1914
See merge request
!26
parents
2442e760
5141f5a3
No related branches found
Branches containing commit
Tags
v0.0.23
Tags containing commit
1 merge request
!26
L2SS-1914: Fix S3 packet loader
Pipeline
#108394
failed
2 weeks ago
Stage: prepare
Stage: lint
Stage: test
Stage: package
Stage: images
Stage: integration
Stage: deploy
Pipeline: Stingray
#108395
Changes
1
Pipelines
4
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
lofar_stingray/reader/_s3_packet_loader.py
+7
-3
7 additions, 3 deletions
lofar_stingray/reader/_s3_packet_loader.py
with
7 additions
and
3 deletions
lofar_stingray/reader/_s3_packet_loader.py
+
7
−
3
View file @
c13bd6cc
# Copyright (C) 202
4
ASTRON (Netherlands Institute for Radio Astronomy)
# Copyright (C) 202
5
ASTRON (Netherlands Institute for Radio Astronomy)
# SPDX-License-Identifier: Apache-2.0
"""
...
...
@@ -8,12 +8,12 @@ of n minutes and storing them on a S3 backend
import
json
import
logging
from
datetime
import
datetime
,
timedelta
import
time
from
datetime
import
datetime
,
timedelta
,
timezone
from
typing
import
Generator
from
minio
import
Minio
import
minio.datatypes
from
minio
import
Minio
logger
=
logging
.
getLogger
()
...
...
@@ -120,6 +120,10 @@ class S3PacketLoader: # pylint: disable=too-few-public-methods
continue
packet
=
json
.
loads
(
line
)
packet_ts
=
datetime
.
fromisoformat
(
packet
[
ts_field
])
packet_ts
=
packet_ts
.
replace
(
tzinfo
=
packet_ts
.
tzinfo
or
timezone
.
utc
).
astimezone
(
timezone
.
utc
)
if
packet_ts
<
start
:
continue
if
packet_ts
>
end
:
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment