Skip to content

Throwing standard error if the wkhtml has returned an error code #22

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

Open
srjpn wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Throwing standard error if the wkhtml has returned an error code #22

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e4789c6
Throwing standard error if the wkhtml has returned an error code
Oct 26, 2018
8ab5c5c
Throwing error if there is error
Oct 29, 2018
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
8 changes: 5 additions & 3 deletions Rotativa.AspNetCore/WkhtmlDriver.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ protected static byte[] Convert(string wkhtmlPath, string switches, string html,
// "-q" - silent output, only errors - no progress messages
// " -" - switch output to stdout
// "- -" - switch input to stdin and output to stdout
switches = "-q " + switches + " -";
switches = switches + " -";

// generate PDF from given HTML string, not from URL
if (!string.IsNullOrEmpty(html))
Expand Down Expand Up @@ -68,7 +68,7 @@ protected static byte[] Convert(string wkhtmlPath, string switches, string html,
}
}

string error = proc.StandardError.ReadToEnd();
var error = proc.StandardError.ReadToEnd();

if (ms.Length == 0)
{
Expand All @@ -77,7 +77,9 @@ protected static byte[] Convert(string wkhtmlPath, string switches, string html,

proc.WaitForExit();

return ms.ToArray();
if(proc.ExitCode == 0 || proc.ExitCode == 2)
return ms.ToArray();
throw new Exception(error);
}
}

Expand Down