Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
FS-SC
AsapoWorker
Commits
bdfe112c
Commit
bdfe112c
authored
Apr 28, 2021
by
Mikhail Karnevskiy
Browse files
Merge branch 'fix/new_streams' into 'master'
Fix streams info See merge request
!28
parents
638c18de
e63861c9
Pipeline
#5503
passed with stage
in 48 seconds
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/AsapoWorker/application.py
View file @
bdfe112c
...
...
@@ -71,7 +71,7 @@ class Application:
parser
.
add_argument
(
"--stream_naming_scheme"
,
type
=
str
,
default
=
"numeric"
,
choices
=
[
"numeric"
,
"date"
,
"basename"
],
"numeric"
,
"date"
,
"basename"
,
"basename_nonfinished"
],
help
=
"Scheme to chose new stream name"
)
parser
.
add_argument
(
...
...
src/AsapoWorker/asapo_receiver.py
View file @
bdfe112c
...
...
@@ -112,7 +112,8 @@ class SimpleAsapoReceiver:
def
get_stream_info
(
self
):
try
:
return
self
.
consumer
.
get_stream_list
(
from_stream
=
self
.
stream
)[
0
]
info
=
self
.
consumer
.
get_stream_list
()
return
next
(
x
for
x
in
info
if
x
[
"name"
]
==
self
.
stream
)
except
asapo_consumer
.
AsapoConsumerError
as
err
:
raise
StreamError
(
"Failed to get stream info"
)
from
err
...
...
src/AsapoWorker/errors.py
View file @
bdfe112c
...
...
@@ -18,6 +18,6 @@ class EndOfStreamError(TemporaryError):
pass
class
StreamFinishedError
(
Temporary
Error
):
class
StreamFinishedError
(
Stream
Error
):
pass
src/AsapoWorker/streamer.py
View file @
bdfe112c
...
...
@@ -166,9 +166,9 @@ class Streamer:
return
None
,
None
except
StreamFinishedError
as
err
:
log
.
info
(
"Stream is finished"
)
self
.
_handle_end_of_stream
()
stream_info
=
self
.
receiver
.
get_stream_info
()
self
.
worker
.
stream_finished
(
stream_info
)
self
.
_handle_end_of_stream
()
# Stop this instance if it can not start new instance anymore
if
self
.
end_of_stream_callback
is
None
:
self
.
stop
()
...
...
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment