github/Ombi
1
0
Fork 0
mirror of https://github.com/Ombi-app/Ombi.git synced 2025-08-19 21:03:17 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed the exception that sometimes makes ombi fallover.

Browse source
This commit is contained in:
TidusJar 2019-01-23 10:18:23 +00:00
commit a6b733e954
2 changed files with 133 additions and 146 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/Ombi/Program.cs
View file

@ -47,8 +47,7 @@ namespace Ombi
instance.StoragePath = storagePath ?? string.Empty; instance.StoragePath = storagePath ?? string.Empty;
// Check if we need to migrate the settings // Check if we need to migrate the settings
CheckAndMigrate(); CheckAndMigrate();
using (var ctx = new SettingsContext()) var ctx = new SettingsContext();
{
var config = ctx.ApplicationConfigurations.ToList(); var config = ctx.ApplicationConfigurations.ToList();
var url = config.FirstOrDefault(x => x.Type == ConfigurationTypes.Url); var url = config.FirstOrDefault(x => x.Type == ConfigurationTypes.Url);
var dbBaseUrl = config.FirstOrDefault(x => x.Type == ConfigurationTypes.BaseUrl); var dbBaseUrl = config.FirstOrDefault(x => x.Type == ConfigurationTypes.BaseUrl);
@ -89,7 +88,6 @@ namespace Ombi
dbBaseUrl.Value = baseUrl; dbBaseUrl.Value = baseUrl;
ctx.SaveChanges(); ctx.SaveChanges();
} }
}
DeleteSchedulesDb(); DeleteSchedulesDb();
@ -111,9 +109,9 @@ namespace Ombi
{ {
var doneGlobal = false; var doneGlobal = false;
var doneConfig = false; var doneConfig = false;
using (var ombi = new OmbiContext()) var ombi = new OmbiContext();
using (var settings = new SettingsContext()) var settings = new SettingsContext();
{
try try
{ {
if (ombi.Settings.Any()) if (ombi.Settings.Any())
@ -148,15 +146,11 @@ namespace Ombi
if (doneConfig) if (doneConfig)
ombi.Database.ExecuteSqlCommand("DELETE FROM ApplicationConfiguration"); ombi.Database.ExecuteSqlCommand("DELETE FROM ApplicationConfiguration");
}
// Now migrate all the external stuff // Now migrate all the external stuff
using (var ombi = new OmbiContext()) var external = new ExternalContext();
using (var external = new ExternalContext())
{
try try
{ {
if (ombi.PlexEpisode.Any()) if (ombi.PlexEpisode.Any())
{ {
external.PlexEpisode.AddRange(ombi.PlexEpisode.ToList()); external.PlexEpisode.AddRange(ombi.PlexEpisode.ToList());
@ -229,8 +223,6 @@ namespace Ombi
} }
} }
}
private static void DeleteSchedulesDb() private static void DeleteSchedulesDb()
{ {
try try

7
src/Ombi/Startup.cs
View file

@ -209,7 +209,7 @@ namespace Ombi
app.UseHangfireDashboard(settings.BaseUrl.HasValue() ? $"{settings.BaseUrl}/hangfire" : "/hangfire", app.UseHangfireDashboard(settings.BaseUrl.HasValue() ? $"{settings.BaseUrl}/hangfire" : "/hangfire",
new DashboardOptions new DashboardOptions
{ {
Authorization = new[] {new HangfireAuthorizationFilter()} Authorization = new[] { new HangfireAuthorizationFilter() }
}); });
} }
@ -237,15 +237,12 @@ namespace Ombi
app.UseMiddleware<ApiKeyMiddlewear>(); app.UseMiddleware<ApiKeyMiddlewear>();
app.UseCors("MyPolicy"); app.UseCors("MyPolicy");
//app.ApiKeyMiddlewear(app.ApplicationServices);
app.UseSwagger(); app.UseSwagger();
app.UseSwaggerUI(c => app.UseSwaggerUI(c =>
{ {
c.SwaggerEndpoint("/swagger/v1/swagger.json", "My API V1"); c.SwaggerEndpoint("/swagger/v1/swagger.json", "My API V1");
}); });
app.UseMvc(routes => app.UseMvc(routes =>
{ {
routes.MapRoute( routes.MapRoute(
@ -256,8 +253,6 @@ namespace Ombi
name: "spa-fallback", name: "spa-fallback",
defaults: new { controller = "Home", action = "Index" }); defaults: new { controller = "Home", action = "Index" });
}); });
ombiService.Dispose();
} }
} }