admin/raven
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
John Cardinal
2020-09-24 19:15:55 +00:00
parent 34785e2605
commit 3ea44f93e8
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dist/docker/linux-x64/ayanovadocker/dockerfile vendored
View File

@@ -1,4 +1,4 @@
FROM mcr.microsoft.com/dotnet/core/aspnet:3.1-alpine
FROM mcr.microsoft.com/dotnet/aspnet:5.0-alpine
WORKDIR /app
COPY ./files .
RUN apk add postgresql-client

15
server/AyaNova/biz/ReportBiz.cs
View File

@@ -425,7 +425,7 @@ namespace AyaNova.Biz
using (var page = await browser.NewPageAsync())
{
//see catch block
var ChromiumProcessID = browser.Process.Id;
// var ChromiumProcessID = browser.Process.Id;
try
{
@@ -677,12 +677,13 @@ namespace AyaNova.Biz
await browser.CloseAsync();
//this probably isn't absolutely necessary but insurance
var process = System.Diagnostics.Process.GetProcessById(ChromiumProcessID);
if (ChromiumProcessID > 0 && process?.HasExited == false)
{
log.LogError($"Error during render, Chromium process (pid {ChromiumProcessID}) still active, forcing it to stop now");
process.Kill();
}
//bugbug: crashes linux?
// var process = System.Diagnostics.Process.GetProcessById(ChromiumProcessID);
// if (ChromiumProcessID > 0 && process?.HasExited == false)
// {
// log.LogError($"Error during render, Chromium process (pid {ChromiumProcessID}) still active, forcing it to stop now");
// process.Kill();
// }
}
}
}