这是indexloc提供的服务,不要输入任何密码
Skip to content
This repository was archived by the owner on Mar 4, 2021. It is now read-only.

Conversation

@nicktgr15
Copy link
Contributor

Hi,

We've made the following changes:

  • CloudFormationChaosMonkey class to enable email notifications when
    no-suffix group names are used.
  • Modified BasicChaosMonkey and BasicChaosEmailNotifier classes to enable
    global email notifications. eg.
    simianarmy.chaos.notification.global.receiverEmail = test@email.com
    is used to enable global email notifications. Added corresponding unit
    test.
  • Refactored TestChaosMonkeyContext to remove duplicate code

CloudFormationChaosMonkey class to enable email notifications when
no-suffix group names are used.

Modified BasicChaosMonkey and BasicChaosEmailNotifier classes to enable
global email notifications. eg.
simianarmy.chaos.notification.global.receiverEmail = test@email.com
is used to enable global email notifications. Added corresponding unit
test.

Refactored TestChaosMonkeyContext to remove duplicate code
@nicktgr15
Copy link
Contributor Author

We'll follow this up with an update to the wiki to cover the email notification property items, both for owner emails and the global option.

@cloudbees-pull-request-builder

SimianArmy-pull-requests #27 SUCCESS
This pull request looks good

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you change '!= null' to StringUtils.notBlank()? This way we can prevent that accidentally setting the global email to empty string stops emails to be sent.

@michaelnflx
Copy link
Contributor

Sorry about my late reply. I was OOO recently. I have added some comments there.

[globalNotificationEnabled.properties]
- separated group email notification logic from global email
notification logic [BasicChaosMonkey.java, ChaosEmailNotifier.java,
BasicChaosEmailNotifier.java]
- added a counter in test context to track global email notifications
[TestChaosMonkeyContext.java]
- added an assert to verify count of global email notifications
[TestBasicChaosMonkey.java -> testGlobalNotificationEnabled()]
@cloudbees-pull-request-builder

SimianArmy-pull-requests #32 SUCCESS
This pull request looks good

@elegantmush
Copy link
Contributor

Hello,
Apologies for the most recent pull request. I work with nicktgr15 who is away on holiday at the moment. I'm trying to address the issues raised by michaelnflx. A few small points left before all the issues raised are addressed. Will comment to let you know when we're done and its ready for review.
Thanks,

suggestion by michaelnflx)
- Logging at INFO level when both global and group notifications are
sent out to differential between them
@cloudbees-pull-request-builder

SimianArmy-pull-requests #33 SUCCESS
This pull request looks good

@elegantmush
Copy link
Contributor

Hello,

Thanks to michaelnflx for the feedback on nicktgr15 's original commits for this pull request. We believe we've addressed the issues you've raised by:

  • adding an extra boolean property for whether global email notifications are enabled
  • separating the flows for global and group-specific termination notifications
  • adding logging to indicate whether it's a global or group-specific notification email
  • changing the check for email address from null-check to StringUtils.isBlank()

Hope this addresses the issues.

Thanks,

@michaelnflx
Copy link
Contributor

Looks good.

michaelnflx added a commit that referenced this pull request Jul 16, 2013
Email notification changes
@michaelnflx michaelnflx merged commit 5a70e95 into Netflix:master Jul 16, 2013
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants