Skip to content

sandboxjs.py: fix checking condition for node:slim #494

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

Merged
merged 1 commit into from
Jul 22, 2017
Merged

sandboxjs.py: fix checking condition for node:slim #494

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 11 additions & 7 deletions cwltool/sandboxjs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ def check_js_threshold_version(working_alias):
"""
# parse nodejs version into int Tuple: 'v4.2.6\n' -> [4, 2, 6]
current_version_str = subprocess.check_output(
[working_alias, "-v"]).decode('ascii')
[working_alias, "-v"]).decode('utf-8')

current_version = [int(v) for v in current_version_str.strip().strip('v').split('.')]
minimum_node_version = [int(v) for v in minimum_node_version_str.split('.')]
Expand All @@ -64,7 +64,7 @@ def new_js_proc():
trynodes = ("nodejs", "node")
for n in trynodes:
try:
if subprocess.check_output([n, "--eval", "process.stdout.write('t')"]) != "t":
if subprocess.check_output([n, "--eval", "process.stdout.write('t')"]).decode('utf-8') != "t":
continue
else:
nodejs = subprocess.Popen([n, "--eval", nodecode],
Expand All @@ -87,9 +87,11 @@ def new_js_proc():
nodeimg = "node:slim"
global have_node_slim
if not have_node_slim:
dockerimgs = subprocess.check_output(["docker", "images", nodeimg]).decode('utf-8')
dockerimgs = subprocess.check_output(["docker", "images", "-q", nodeimg]).decode('utf-8')
# if output is an empty string
if len(dockerimgs.split("\n")) <= 1:
nodejsimg = subprocess.check_output(["docker", "pull", nodeimg])
# pull node:slim docker container
nodejsimg = subprocess.check_output(["docker", "pull", nodeimg]).decode('utf-8')
_logger.info("Pulled Docker image %s %s", nodeimg, nodejsimg)
have_node_slim = True
nodejs = subprocess.Popen(["docker", "run",
Expand Down Expand Up @@ -134,7 +136,8 @@ def execjs(js, jslib, timeout=None, debug=False): # type: (Union[Mapping, Text]

killed = []

def term():
""" Kill the node process if it exceeds timeout limit"""
def terminate():
try:
killed.append(True)
nodejs.kill()
Expand All @@ -144,7 +147,7 @@ def term():
if timeout is None:
timeout = 20

tm = threading.Timer(timeout, term)
tm = threading.Timer(timeout, terminate)
tm.start()

stdin_buf = BytesIO((json.dumps(fn) + "\n").encode('utf-8'))
Expand All @@ -154,7 +157,8 @@ def term():
rselect = [nodejs.stdout, nodejs.stderr] # type: List[BytesIO]
wselect = [nodejs.stdin] # type: List[BytesIO]

# On windows system standard input/output are not handled properly by select module(modules like pywin32, msvcrt, gevent don't work either)
# On windows system standard input/output are not handled properly by select module
# (modules like pywin32, msvcrt, gevent don't work either)
if sys.platform=='win32':
READ_BYTES_SIZE = 512

Expand Down