Skip to content

Commit 68ae2d2

Browse files
authored
Add a exeflags kwarg to the get_connect_cmd() function (#14)
* Add a `exeflags` kwarg to the `get_connect_cmd()` function
1 parent 4bb558a commit 68ae2d2

File tree

3 files changed

+12
-9
lines changed

3 files changed

+12
-9
lines changed

src/ElasticClusterManager.jl

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,14 @@ using Distributed: launch, manage, kill, init_worker, connect
1414
export launch, manage, kill, init_worker, connect
1515
export ElasticManager, elastic_worker
1616

17-
function worker_cookie()
18-
Distributed.init_multi()
19-
return Distributed.cluster_cookie()
20-
end
21-
22-
worker_arg() = `--worker=$(worker_cookie())`
17+
# This seems to be currently unused:
18+
# function worker_cookie()
19+
# Distributed.init_multi()
20+
# return Distributed.cluster_cookie()
21+
# end
22+
23+
# This seems to be currently unused:
24+
# worker_arg() = `--worker=$(worker_cookie())`
2325

2426
include("elastic.jl")
2527

src/elastic.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,8 +147,7 @@ function elastic_worker(cookie, addr="127.0.0.1", port=9009; stdout_to_master=tr
147147
Distributed.start_worker(c, cookie)
148148
end
149149

150-
function get_connect_cmd(em::ElasticManager; absolute_exename=true, same_project=true)
151-
150+
function get_connect_cmd(em::ElasticManager; absolute_exename=true, same_project=true, exeflags::Tuple=())
152151
ip = string(em.sockname[1])
153152
port = convert(Int,em.sockname[2])
154153
cookie = Distributed.cluster_cookie()
@@ -157,6 +156,7 @@ function get_connect_cmd(em::ElasticManager; absolute_exename=true, same_project
157156

158157
join([
159158
exename,
159+
exeflags...,
160160
project...,
161161
"-e 'import ElasticClusterManager; ElasticClusterManager.elastic_worker(\"$cookie\",\"$ip\",$port)'"
162162
]," ")

test/elastic.jl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
@test em isa ElasticManager
66

77
# launch worker
8-
old_cmd = ElasticClusterManager.get_connect_cmd(em)
8+
exeflags = ("--code-coverage=user",)
9+
old_cmd = ElasticClusterManager.get_connect_cmd(em; exeflags=exeflags)
910
new_cmd = `$(old_cmd) --coverage=user`
1011
# run(`sh -c $(new_cmd)`) # comment out this line when you are finished debugging
1112
run(`sh -c $(new_cmd)`; wait=false) # uncomment this line when you are finished debugging

0 commit comments

Comments
 (0)