Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-07-09 03:04:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

#51 - Restart the server took long time, and dashboard will die

Browse Source
This commit is contained in:
LukePulverenti 2013-03-13 16:23:46 -04:00
parent 3303f30f8a
commit 3dc9cacfad
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
MediaBrowser.ServerApplication/App.xaml.cs
View File

@ -134,6 +134,11 @@ namespace MediaBrowser.ServerApplication
Logger.ErrorException("UnhandledException", exception); Logger.ErrorException("UnhandledException", exception);
MessageBox.Show("Unhandled exception: " + exception.Message); MessageBox.Show("Unhandled exception: " + exception.Message);
if (!Debugger.IsAttached)
{
Environment.Exit(System.Runtime.InteropServices.Marshal.GetHRForException(exception));
}
} }
/// <summary> /// <summary>

13
MediaBrowser.WebDashboard/Html/scripts/site.js
View File

@ -382,7 +382,7 @@ var Dashboard = {
setTimeout(function () { setTimeout(function () {
Dashboard.reloadPageWhenServerAvailable(); Dashboard.reloadPageWhenServerAvailable();
}, 500); }, 250);
}).fail(function () { }).fail(function () {
Dashboard.suppressAjaxErrors = false; Dashboard.suppressAjaxErrors = false;
@ -391,10 +391,17 @@ var Dashboard = {
reloadPageWhenServerAvailable: function (retryCount) { reloadPageWhenServerAvailable: function (retryCount) {
ApiClient.getSystemInfo().done(function () { ApiClient.getSystemInfo().done(function (info) {
Dashboard.reloadPage();
// If this is back to false, the restart completed
if (!info.HasPendingRestart) {
Dashboard.reloadPage();
} else {
Dashboard.reloadPageWhenServerAvailable(retryCount);
}
}).fail(function () { }).fail(function () {
setTimeout(function () { setTimeout(function () {
retryCount = retryCount || 0; retryCount = retryCount || 0;