github
/
statping
mirror of https://github.com/statping/statping
1
0
Fork 0
Code Issues Releases Wiki Activity

Replace all `core.*` Code Lines from notifier Package 

Replace all `core.*` Code Lines from notifier Package with the new
Fields of the Service-Struct.
pull/258/head
Emanuel Bennici 2019-10-04 17:25:57 +02:00
parent 6ba5d53a50
commit d462e54053
No known key found for this signature in database
GPG Key ID: 17FA2D56BAD01661
6 changed files with 26 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
notifiers/discord.go
View File

@ -75,14 +75,13 @@ func (u *discord) OnFailure(s *types.Service, f *types.Failure) {
// OnSuccess will trigger successful service // OnSuccess will trigger successful service
func (u *discord) OnSuccess(s *types.Service) { func (u *discord) OnSuccess(s *types.Service) {
if !s.Online { if !s.Online || !s.SuccessNotified {
u.ResetUniqueQueue(fmt.Sprintf("service_%v", s.Id)) u.ResetUniqueQueue(fmt.Sprintf("service_%v", s.Id))
var msg interface{} var msg interface{}
if core.CoreApp.UpdateNotify.Bool { if s.UpdateNotify {
msg = fmt.Sprintf(`{"content": "%s"}`, core.ReturnService(s).SmallText()) s.UpdateNotify = false
} else {
msg = fmt.Sprintf(`{"content": "Your service '%v' is back online!"}`, s.Name)
} }
msg = s.DownText
u.AddQueue(fmt.Sprintf("service_%v", s.Id), msg) u.AddQueue(fmt.Sprintf("service_%v", s.Id), msg)
} }

9
notifiers/email.go
View File

@ -198,13 +198,12 @@ func (u *email) OnFailure(s *types.Service, f *types.Failure) {
// OnSuccess will trigger successful service // OnSuccess will trigger successful service
func (u *email) OnSuccess(s *types.Service) { func (u *email) OnSuccess(s *types.Service) {
if !s.Online { if !s.Online || !s.SuccessNotified {
var msg string var msg string
if core.CoreApp.UpdateNotify.Bool { if s.UpdateNotify {
msg = core.ReturnService(s).SmallText() s.UpdateNotify = false
} else {
msg = fmt.Sprintf("Service %v is Back Online", s.Name)
} }
msg = s.DownText
u.ResetUniqueQueue(fmt.Sprintf("service_%v", s.Id)) u.ResetUniqueQueue(fmt.Sprintf("service_%v", s.Id))
email := &emailOutgoing{ email := &emailOutgoing{

9
notifiers/line_notify.go
View File

@ -78,13 +78,12 @@ func (u *lineNotifier) OnFailure(s *types.Service, f *types.Failure) {
// OnSuccess will trigger successful service // OnSuccess will trigger successful service
func (u *lineNotifier) OnSuccess(s *types.Service) { func (u *lineNotifier) OnSuccess(s *types.Service) {
if !s.Online { if !s.Online || !s.SuccessNotified {
var msg string var msg string
if core.CoreApp.UpdateNotify.Bool { if s.UpdateNotify {
msg = core.ReturnService(s).SmallText() s.UpdateNotify = false
} else {
msg = fmt.Sprintf("Your Service %v is Back Online", s.Name)
} }
msg = s.DownText
u.ResetUniqueQueue(fmt.Sprintf("service_%v", s.Id)) u.ResetUniqueQueue(fmt.Sprintf("service_%v", s.Id))
u.AddQueue(fmt.Sprintf("service_%v", s.Id), msg) u.AddQueue(fmt.Sprintf("service_%v", s.Id), msg)

9
notifiers/mobile.go
View File

@ -105,13 +105,12 @@ func (u *mobilePush) OnFailure(s *types.Service, f *types.Failure) {
// OnSuccess will trigger successful service // OnSuccess will trigger successful service
func (u *mobilePush) OnSuccess(s *types.Service) { func (u *mobilePush) OnSuccess(s *types.Service) {
data := dataJson(s, nil) data := dataJson(s, nil)
if !s.Online { if !s.Online || !s.SuccessNotified {
var msgStr string var msgStr string
if core.CoreApp.UpdateNotify.Bool { if s.UpdateNotify {
msgStr = core.ReturnService(s).SmallText() s.UpdateNotify = false
} else {
msgStr = fmt.Sprintf("Your Service %v is Back Online", s.Name)
} }
msgStr = s.DownText
u.ResetUniqueQueue(fmt.Sprintf("service_%v", s.Id)) u.ResetUniqueQueue(fmt.Sprintf("service_%v", s.Id))
msg := &pushArray{ msg := &pushArray{

10
notifiers/telegram.go
View File

@ -97,14 +97,14 @@ func (u *telegram) OnFailure(s *types.Service, f *types.Failure) {
// OnSuccess will trigger successful service // OnSuccess will trigger successful service
func (u *telegram) OnSuccess(s *types.Service) { func (u *telegram) OnSuccess(s *types.Service) {
if !s.Online { if !s.Online || !s.SuccessNotified {
u.ResetUniqueQueue(fmt.Sprintf("service_%v", s.Id)) u.ResetUniqueQueue(fmt.Sprintf("service_%v", s.Id))
var msg interface{} var msg interface{}
if core.CoreApp.UpdateNotify.Bool { if s.UpdateNotify {
msg = core.ReturnService(s).SmallText() s.UpdateNotify = false
} else {
msg = fmt.Sprintf("Your service '%v' is currently offline!", s.Name)
} }
msg = s.DownText
u.AddQueue(fmt.Sprintf("service_%v", s.Id), msg) u.AddQueue(fmt.Sprintf("service_%v", s.Id), msg)
} }
} }

10
notifiers/twilio.go
View File

@ -107,14 +107,14 @@ func (u *twilio) OnFailure(s *types.Service, f *types.Failure) {
// OnSuccess will trigger successful service // OnSuccess will trigger successful service
func (u *twilio) OnSuccess(s *types.Service) { func (u *twilio) OnSuccess(s *types.Service) {
if !s.Online { if !s.Online || !s.SuccessNotified {
u.ResetUniqueQueue(fmt.Sprintf("service_%v", s.Id)) u.ResetUniqueQueue(fmt.Sprintf("service_%v", s.Id))
var msg string var msg string
if core.CoreApp.UpdateNotify.Bool { if s.UpdateNotify {
msg = core.ReturnService(s).SmallText() s.UpdateNotify = false
} else {
msg = fmt.Sprintf("Your Service %v is Back Online", s.Name)
} }
msg = s.DownText
u.AddQueue(fmt.Sprintf("service_%v", s.Id), msg) u.AddQueue(fmt.Sprintf("service_%v", s.Id), msg)
} }
} }