github/Ombi
1
0
Fork 0
mirror of https://github.com/Ombi-app/Ombi.git synced 2025-07-16 02:02:55 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Quick fix for email false positive message. ISSUE: #1286

Browse source
This commit is contained in:
Dhruv Bhavsar 2017-03-26 12:15:33 -04:00
parent 3be69cbd61
commit 3f0cc99f56
4 changed files with 33 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Ombi.Services/Notification/EmailMessageNotification.cs
View file

@ -227,6 +227,7 @@ namespace Ombi.Services.Notification
catch (Exception e) catch (Exception e)
{ {
Log.Error(e); Log.Error(e);
throw new InvalidOperationException(e.Message);
} }
} }

1
Ombi.Services/Notification/NotificationService.cs
View file

@ -97,6 +97,7 @@ namespace Ombi.Services.Notification
catch (Exception ex) catch (Exception ex)
{ {
Log.Error(ex, $"Notification '{notification.NotificationName}' failed with exception"); Log.Error(ex, $"Notification '{notification.NotificationName}' failed with exception");
throw new InvalidOperationException(ex.Message);
} }
} }
} }

13
Ombi.UI/Modules/Admin/AdminModule.cs
View file

@ -126,7 +126,7 @@ namespace Ombi.UI.Modules.Admin
ISlackApi slackApi, ISettingsService<LandingPageSettings> lp, ISlackApi slackApi, ISettingsService<LandingPageSettings> lp,
ISettingsService<ScheduledJobsSettings> scheduler, IJobRecord rec, IAnalytics analytics, ISettingsService<ScheduledJobsSettings> scheduler, IJobRecord rec, IAnalytics analytics,
ISettingsService<NotificationSettingsV2> notifyService, IRecentlyAdded recentlyAdded, IMassEmail massEmail, ISettingsService<NotificationSettingsV2> notifyService, IRecentlyAdded recentlyAdded, IMassEmail massEmail,
ISettingsService<WatcherSettings> watcherSettings , ISettingsService<WatcherSettings> watcherSettings,
ISettingsService<DiscordNotificationSettings> discord, ISettingsService<DiscordNotificationSettings> discord,
IDiscordApi discordapi, ISettingsService<RadarrSettings> settings, IRadarrApi radarrApi, IDiscordApi discordapi, ISettingsService<RadarrSettings> settings, IRadarrApi radarrApi,
ISettingsService<EmbySettings> embySettings, IEmbyApi emby ISettingsService<EmbySettings> embySettings, IEmbyApi emby
@ -642,9 +642,11 @@ namespace Ombi.UI.Modules.Admin
await NotificationService.Publish(notificationModel, settings); await NotificationService.Publish(notificationModel, settings);
Log.Info("Sent email notification test"); Log.Info("Sent email notification test");
} }
catch (Exception) catch (Exception ex)
{ {
Log.Error("Failed to subscribe and publish test Email Notification"); Log.Error("Failed to subscribe and publish test Email Notification");
var msg = "Failed: " + ex.Message;
return Response.AsJson(new JsonResponseModel { Result = false, Message = msg });
} }
finally finally
{ {
@ -653,7 +655,9 @@ namespace Ombi.UI.Modules.Admin
NotificationService.UnSubscribe(new EmailMessageNotification(EmailService)); NotificationService.UnSubscribe(new EmailMessageNotification(EmailService));
} }
} }
return Response.AsJson(new JsonResponseModel { Result = true, Message = "Successfully sent a test Email Notification!" }); return Response.AsJson(new JsonResponseModel { Result = true, Message = "Successfully sent a test Email Notification!" });
} }
private Response SaveEmailNotifications() private Response SaveEmailNotifications()
@ -832,7 +836,7 @@ namespace Ombi.UI.Modules.Admin
} }
if (!settings.Enabled) if (!settings.Enabled)
{ {
return Response.AsJson(new CouchPotatoProfiles{list = new List<ProfileList>()}); return Response.AsJson(new CouchPotatoProfiles { list = new List<ProfileList>() });
} }
var profiles = CpApi.GetProfiles(settings.FullUri, settings.ApiKey); var profiles = CpApi.GetProfiles(settings.FullUri, settings.ApiKey);
@ -1299,7 +1303,8 @@ namespace Ombi.UI.Modules.Admin
{ {
var settings = this.Bind<MassEmailSettings>(); var settings = this.Bind<MassEmailSettings>();
Log.Debug("Clicked Admin Mass Email Test"); Log.Debug("Clicked Admin Mass Email Test");
if (settings.Subject == null) { if (settings.Subject == null)
{
return Response.AsJson(new JsonResponseModel { Result = false, Message = "Please Set a Subject" }); return Response.AsJson(new JsonResponseModel { Result = false, Message = "Please Set a Subject" });
} }
if (settings.Body == null) if (settings.Body == null)

3
Ombi.UI/Modules/Admin/CustomizationModule.cs
View file

@ -122,8 +122,7 @@ namespace Ombi.UI.Modules.Admin
} }
catch (Exception e) catch (Exception e)
{ {
throw e;
throw;
} }
} }
} }