Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
edx-video-pipeline
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
edx-video-pipeline
Commits
83a346ca
Commit
83a346ca
authored
Sep 28, 2017
by
Gregory Martin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Implement global timeout
EDUCATOR-1426
parent
e1893699
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
4 deletions
+5
-4
control/veda_val.py
+4
-4
instance_config.yaml
+1
-0
No files found.
control/veda_val.py
View file @
83a346ca
...
...
@@ -106,7 +106,7 @@ class VALAPICall():
'password'
:
self
.
auth_dict
[
'val_password'
],
}
r
=
requests
.
post
(
self
.
auth_dict
[
'val_token_url'
],
data
=
payload
,
timeout
=
20
)
r
=
requests
.
post
(
self
.
auth_dict
[
'val_token_url'
],
data
=
payload
,
timeout
=
self
.
auth_dict
[
'global_timeout'
]
)
if
r
.
status_code
!=
200
:
ErrorObject
.
print_error
(
...
...
@@ -222,7 +222,7 @@ class VALAPICall():
self
.
video_proto
.
val_id
)),
headers
=
self
.
headers
,
timeout
=
20
timeout
=
self
.
auth_dict
[
'global_timeout'
]
)
if
r1
.
status_code
!=
200
and
r1
.
status_code
!=
404
:
...
...
@@ -327,7 +327,7 @@ class VALAPICall():
self
.
auth_dict
[
'val_api_url'
]
+
'/'
,
data
=
json
.
dumps
(
sending_data
),
headers
=
self
.
headers
,
timeout
=
20
timeout
=
self
.
auth_dict
[
'global_timeout'
]
)
if
r2
.
status_code
>
299
:
...
...
@@ -374,7 +374,7 @@ class VALAPICall():
)),
data
=
json
.
dumps
(
sending_data
),
headers
=
self
.
headers
,
timeout
=
20
timeout
=
self
.
auth_dict
[
'global_timeout'
]
)
if
r4
.
status_code
>
299
:
...
...
instance_config.yaml
View file @
83a346ca
...
...
@@ -166,5 +166,6 @@ val_profile_dict:
# Heal settings
heal_start
:
1
heal_end
:
144
global_timeout
:
40
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a 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