Skip to content

Commit 2b326d3

Browse files
GregPlowmanfredrikekre
authored andcommitted
Align worker output after prefix "From worker" (#24716)
* Align worker output after prefix "From worker" * More updates to align worker output (#2) * Update ZMQCM.jl * Update UnixDomainCM.jl * Update runtests.jl * Update embedding-test.jl
1 parent 999a4ff commit 2b326d3

File tree

5 files changed

+6
-6
lines changed

5 files changed

+6
-6
lines changed

base/distributed/cluster.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -245,12 +245,12 @@ end
245245
function redirect_worker_output(ident, stream)
246246
@schedule while !eof(stream)
247247
line = readline(stream)
248-
if startswith(line, "\tFrom worker ")
248+
if startswith(line, " From worker ")
249249
# STDOUT's of "additional" workers started from an initial worker on a host are not available
250250
# on the master directly - they are routed via the initial worker's STDOUT.
251251
println(line)
252252
else
253-
println("\tFrom worker $(ident):\t$line")
253+
println(" From worker $(ident):\t$line")
254254
end
255255
end
256256
end

examples/clustermanager/0mq/ZMQCM.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@ end
275275
function print_worker_stdout(io, pid)
276276
@schedule while !eof(io)
277277
line = readline(io)
278-
println("\tFrom worker $(pid):\t$line")
278+
println(" From worker $(pid):\t$line")
279279
end
280280
end
281281

examples/clustermanager/simple/UnixDomainCM.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ end
8383
function print_worker_stdout(io, pid)
8484
@schedule while !eof(io)
8585
line = readline(io)
86-
println("\tFrom worker $(pid):\t$line")
86+
println(" From worker $(pid):\t$line")
8787
end
8888
end
8989

examples/embedding/embedding-test.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,5 @@ end
2424
@test parse(Float64, lines[1]) sqrt(2)
2525
@test lines[8] == "called bar"
2626
@test lines[9] == "calling new bar"
27-
@test lines[10] == "\tFrom worker 2:\tTaking over the world..."
27+
@test lines[10] == " From worker 2:\tTaking over the world..."
2828
end

test/runtests.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ cd(dirname(@__FILE__)) do
119119
# the test fails, catch the error,
120120
# and either way, append the results
121121
# to the overall aggregator
122-
n > 1 && print("\tFrom worker 1:\t")
122+
n > 1 && print(" From worker 1:\t")
123123
isolate = true
124124
t == "SharedArrays" && (isolate = false)
125125
local resp

0 commit comments

Comments
 (0)