[][SVCS-683] Add timeouts for subprocess calls #332
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
cslzchen
requested changes
May 3, 2018
There was a problem hiding this comment.
Here is a few minor issues and back to you 🔥 :
- Rebase to the latest
developand fix travis. - Update style.
- Since
unoconvalready have the fix, can you provide a link so we know if this is a similar one or not? Are the 10 seconds what we've agreed on or just a experimental number? Is this code eligible for test? It would be great if you can provide more information on the PR.
mfr/extensions/jsc3d/export.py
Outdated
| self.output_file_path, | ||
| # silence output from freecadcmd | ||
| ], stdout=subprocess.DEVNULL) | ||
| subprocess.check_call( |
There was a problem hiding this comment.
How about the following style?
cmd = [FREECAD_BIN, FREECAD_CONVERT_SCRIPT, temp_source_file.name, self.output_file_path]
subprocess.check_call(cmd, stdout=subprocess.DEVNULL, timeout=settings.FREECAD_TIMEOUT)
mfr/extensions/jsc3d/export.py
Outdated
| FREECAD_CONVERT_SCRIPT, | ||
| temp_source_file.name, | ||
| self.output_file_path, | ||
| # silence output from freecadcmd |
There was a problem hiding this comment.
Move this misplaced comments to the right place.
mfr/extensions/jsc3d/export.py
Outdated
| code=504, | ||
| process='freecad', | ||
| cmd=str(err.cmd), | ||
| returncode=52, # This is not re error code returned by the |
There was a problem hiding this comment.
This commenting style is far from Pythonic. You can move it to before the raise as a comment for the raise statement.
mfr/extensions/tabular/utilities.py
Outdated
| fp.name, | ||
| csv_file.name, | ||
| ]) | ||
| subprocess.check_call( |
There was a problem hiding this comment.
Similar style update as mentioned before.
mfr/extensions/tabular/utilities.py
Outdated
| code=504, | ||
| process='pspp', | ||
| cmd=str(err.cmd), | ||
| returncode=52, # This is not re error code returned by the |
There was a problem hiding this comment.
Similar style update as mentioned before.
NyanHelsing
force-pushed
the
ft/add-subproc-to
branch
from
fecdf33
to
4e0a287
Compare
NyanHelsing
commented
Jun 4, 2018
mfr/extensions/default/exporter.py
Outdated
| @@ -0,0 +1,5 @@ | |||
| from mfr.core.extension import BaseExporter | |||
|
|
|||
| class DefaultExporter(BaseExporter): | |||
|
Needs a rebase |
NyanHelsing
force-pushed
the
ft/add-subproc-to
branch
from
4e0a287
to
58fe0d6
Compare
NyanHelsing
force-pushed
the
ft/add-subproc-to
branch
2 times, most recently
from
3b94e88
to
00096d5
Compare
NyanHelsing
force-pushed
the
ft/add-subproc-to
branch
from
3f230c2
to
81b5b8c
Compare
NyanHelsing
force-pushed
the
ft/add-subproc-to
branch
from
81b5b8c
to
2862304
Compare
All three of the current exporters use a subprocess call to perform the export. To prevent the process from hanging, we add a condition to kill th process after a specified period of time.
felliott
force-pushed
the
ft/add-subproc-to
branch
from
2862304
to
05408e9
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Ticket
SVCS-683 Add timeouts for subprocess calls
Purpose
Make subprocess time out instead of hanging indefinitely.
Changes
Side effects
May make files that are particularly large time out if they take too long.
QA Notes
Deployment Notes
Adds a couple of ENV vars to configure the timeout if desired. Default set to 10s.