Skip to content
This repository was archived by the owner on Mar 4, 2021. It is now read-only.

Record the suffix-stripped version of termination events by the CloudFor... #140

Merged
ebukoski merged 4 commits into from
Jul 23, 2015
Merged

Record the suffix-stripped version of termination events by the CloudFor... #140

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bc964a4
Record the suffix-stripped version of termination events by the Cloud…
gnethercutt Oct 13, 2014
1b47aa8
Make terminateInstance() protected to support overriding by the subcl…
gnethercutt Oct 13, 2014
dc201fb
Conversion to the noSuffixInstance group name now happens in terminat…
gnethercutt Oct 13, 2014
297c7fd
Merge branch 'master' into cloudformation_asg_termination_naming
gnethercutt Dec 14, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Record the suffix-stripped version of termination events by the Cloud… 
…FormationChaosMonkey to correctly respect maxTerminationsPerDay
  • Loading branch information
@gnethercutt
gnethercutt committed Oct 13, 2014
commit bc964a4147189ce0fa3a15f049d46e9565a2a583
10 changes: 10 additions & 0 deletions src/main/java/com/netflix/simianarmy/basic/chaos/CloudFormationChaosMonkey.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.netflix.simianarmy.basic.chaos;

import com.netflix.simianarmy.MonkeyRecorder.Event;
import com.netflix.simianarmy.chaos.ChaosCrawler.InstanceGroup;
import com.netflix.simianarmy.chaos.ChaosType;

Expand All @@ -26,6 +27,15 @@ protected boolean isGroupEnabled(InstanceGroup group) {
InstanceGroup noSuffixGroup = noSuffixInstanceGroup(group);
return super.isGroupEnabled(noSuffixGroup);
}

/**
* {@inheritDoc}
*/
@Override
protected Event terminateInstance(InstanceGroup group, String inst, ChaosType chaosType) {
InstanceGroup noSuffixGroup = noSuffixInstanceGroup(group);
return super.terminateInstance(noSuffixGroup, inst, chaosType);
}

/**
* {@inheritDoc}
Expand Down