Skip to content
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

Make all errors in start warnings, actually throw when calling save_payload #18

Merged
merged 8 commits into from
Mar 5, 2024
Merged

Make all errors in start warnings, actually throw when calling save_payload #18

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4997155
move error throwing to save_payload.
disberd Mar 4, 2024
0d3a56e
use Pipes for the error msg
disberd Mar 4, 2024
d193055
increase sleep?
disberd Mar 4, 2024
c81b745
make timeout a kwarg and specify its use in the log error
disberd Mar 4, 2024
21a1ff6
improve error message
disberd Mar 4, 2024
f42e6ef
defaults to warn rather than error. Remove the error message variable…
disberd Mar 5, 2024
7a15b75
typo
disberd Mar 5, 2024
5a0c00f
other typo
disberd Mar 5, 2024
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
21 changes: 17 additions & 4 deletions src/PlotlyKaleido.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,15 @@ const P = Pipes()
const _mathjax_url_path = "https://cdnjs.cloudflare.com/ajax/libs/mathjax"
const _mathjax_last_version = v"2.7.9"

const _error_msg = Ref("")
disberd marked this conversation as resolved.
Show resolved Hide resolved
haserror() = !isempty(_error_msg[])
function seterror(s::String)
_error_msg[] = s
@error "$(_error_msg[])"
kill_kaleido()
return nothing
end

kill_kaleido() = is_running() && (kill(P.proc); wait(P.proc))

is_running() = isdefined(P, :proc) && isopen(P.stdin) && process_running(P.proc)
Expand Down Expand Up @@ -49,7 +58,7 @@ function readline_noblock(io)
schedule(task)
wait(task)
out = take!(msg)
out === "Stopped" && error("It looks like the kaleido process is hanging.
out === "Stopped" && seterror("It looks like the kaleido process is hanging.
If you are on windows this might be caused by known problems with Kaleido v0.2 on windows.
You might want to try forcing a downgrade of the kaleido library to 0.1.
Check the Package Readme at https://github.com/JuliaPlots/PlotlyKaleido.jl/tree/main#windows-note for more details")
Expand All @@ -63,6 +72,7 @@ function start(;
kwargs...,
)
is_running() && return
_error_msg[] = ""
# The kaleido executable must be ran from the artifact directory
BIN = Cmd(kaleido(); dir = Kaleido_jll.artifact_dir)
# We push the mandatory plotly flag
Expand Down Expand Up @@ -126,9 +136,11 @@ function start(;
P.proc = kproc

res = readline_noblock(P.stdout) # {"code": 0, "message": "Success", "result": null, "version": "0.2.1"}
length(res) == 0 && error("Kaleido startup failed.")
code = JSON.parse(res)["code"]
code == 0 || error("Kaleido startup failed with code $code.")
length(res) == 0 && seterror("Kaleido startup failed.")
if !haserror()
code = JSON.parse(res)["code"]
code == 0 || seterror("Kaleido startup failed with code $code.")
end
return
end

Expand All @@ -139,6 +151,7 @@ const TEXT_FORMATS = ["svg", "json", "eps"]


function save_payload(io::IO, payload::AbstractString, format::AbstractString)
haserror() && error(_error_msg[])
format in ALL_FORMATS || error("Unknown format $format. Expected one of $ALL_FORMATS")

bytes = transcode(UInt8, payload)
Expand Down
Loading