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

move servlet to resources package, fix #2 #4

Merged
merged 1 commit into from
Jul 14, 2012
Merged

move servlet to resources package, fix #2 #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion src/main/java/com/netflix/simianarmy/MonkeyRunner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ public <T extends Monkey> T factory(Class<T> monkeyClass, Class<? extends Monkey
}
} catch (Exception e) {
LOGGER.error("monkeyFactory error, cannot make monkey from " + monkeyClass.getName() + " with "
+ (contextClass == null ? null : contextClass.getName()), e);
+ (contextClass == null ? null : contextClass.getName()), e);
}

return null;
Expand Down
57 changes: 0 additions & 57 deletions src/main/java/com/netflix/simianarmy/basic/chaos/BasicChaosMonkey.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,31 +19,18 @@

import com.netflix.simianarmy.chaos.ChaosMonkey;
import com.netflix.simianarmy.MonkeyConfiguration;
import com.netflix.simianarmy.MonkeyRunner;
import com.netflix.simianarmy.MonkeyRecorder.Event;
import com.netflix.simianarmy.chaos.ChaosCrawler.InstanceGroup;

import java.util.Map;
import java.util.HashMap;
import java.util.List;
import java.util.Calendar;
import java.util.Date;
import java.util.concurrent.TimeUnit;
import java.io.ByteArrayOutputStream;
import java.io.IOException;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import javax.ws.rs.GET;
import javax.ws.rs.Path;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;

import org.codehaus.jackson.JsonEncoding;
import org.codehaus.jackson.JsonGenerator;
import org.codehaus.jackson.map.MappingJsonFactory;

public class BasicChaosMonkey extends ChaosMonkey {
private static final Logger LOGGER = LoggerFactory.getLogger(ChaosMonkey.class);
private static final String NS = "simianarmy.chaos.";
Expand Down Expand Up @@ -133,48 +120,4 @@ public void recordTermination(InstanceGroup group, String instance) {
evt.addField("groupName", group.name());
context().recorder().recordEvent(evt);
}

@Path("/chaos")
@SuppressWarnings("serial")
public static class Servlet {
private static final MappingJsonFactory JSON_FACTORY = new MappingJsonFactory();

private ChaosMonkey monkey = MonkeyRunner.getInstance().factory(ChaosMonkey.class);

@GET
public Response getChaosEvents(@javax.ws.rs.core.Context UriInfo uriInfo) throws IOException {
Map<String, String> query = new HashMap<String, String>();
Date date = new Date(0);
for (Map.Entry<String, List<String>> pair : uriInfo.getQueryParameters().entrySet()) {
if (pair.getValue().isEmpty()) {
continue;
}
if (pair.getKey().equals("since")) {
date = new Date(Long.parseLong(pair.getValue().get(0)));
} else {
query.put(pair.getKey(), pair.getValue().get(0));
}
}

List<Event> evts = monkey.context().recorder()
.findEvents(Type.CHAOS, EventTypes.CHAOS_TERMINATION, query, date);

ByteArrayOutputStream baos = new ByteArrayOutputStream();
JsonGenerator gen = JSON_FACTORY.createJsonGenerator(baos, JsonEncoding.UTF8);
gen.writeStartArray();
for (Event evt : evts) {
gen.writeStartObject();
gen.writeStringField("monkeyType", evt.monkeyType().name());
gen.writeStringField("eventType", evt.eventType().name());
gen.writeNumberField("eventTime", evt.eventTime().getTime());
for (Map.Entry<String, String> pair : evt.fields().entrySet()) {
gen.writeStringField(pair.getKey(), pair.getValue());
}
gen.writeEndObject();
}
gen.writeEndArray();
gen.close();
return Response.status(Response.Status.OK).entity(baos).build();
}
}
}
82 changes: 82 additions & 0 deletions src/main/java/com/netflix/simianarmy/resources/chaos/ChaosMonkeyServlet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
/*
*
* Copyright 2012 Netflix, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.netflix.simianarmy.resources.chaos;

import com.netflix.simianarmy.chaos.ChaosMonkey;
import com.netflix.simianarmy.MonkeyRunner;
import com.netflix.simianarmy.MonkeyRecorder.Event;

import java.util.Map;
import java.util.HashMap;
import java.util.List;
import java.util.Date;
import java.io.ByteArrayOutputStream;
import java.io.IOException;

import javax.ws.rs.GET;
import javax.ws.rs.Path;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;

import org.codehaus.jackson.JsonEncoding;
import org.codehaus.jackson.JsonGenerator;
import org.codehaus.jackson.map.MappingJsonFactory;

@Path("/chaos")
@SuppressWarnings("serial")
public class ChaosMonkeyServlet {
private static final MappingJsonFactory JSON_FACTORY = new MappingJsonFactory();

private ChaosMonkey monkey = MonkeyRunner.getInstance().factory(ChaosMonkey.class);

@GET
public Response getChaosEvents(@javax.ws.rs.core.Context UriInfo uriInfo) throws IOException {
Map<String, String> query = new HashMap<String, String>();
Date date = new Date(0);
for (Map.Entry<String, List<String>> pair : uriInfo.getQueryParameters().entrySet()) {
if (pair.getValue().isEmpty()) {
continue;
}
if (pair.getKey().equals("since")) {
date = new Date(Long.parseLong(pair.getValue().get(0)));
} else {
query.put(pair.getKey(), pair.getValue().get(0));
}
}

List<Event> evts = monkey.context().recorder()
.findEvents(ChaosMonkey.Type.CHAOS, ChaosMonkey.EventTypes.CHAOS_TERMINATION, query, date);

ByteArrayOutputStream baos = new ByteArrayOutputStream();
JsonGenerator gen = JSON_FACTORY.createJsonGenerator(baos, JsonEncoding.UTF8);
gen.writeStartArray();
for (Event evt : evts) {
gen.writeStartObject();
gen.writeStringField("monkeyType", evt.monkeyType().name());
gen.writeStringField("eventType", evt.eventType().name());
gen.writeNumberField("eventTime", evt.eventTime().getTime());
for (Map.Entry<String, String> pair : evt.fields().entrySet()) {
gen.writeStringField(pair.getKey(), pair.getValue());
}
gen.writeEndObject();
}
gen.writeEndArray();
gen.close();
return Response.status(Response.Status.OK).entity(baos).build();
}
}
2 changes: 1 addition & 1 deletion src/main/webapp/WEB-INF/web.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<servlet-class>com.sun.jersey.spi.container.servlet.ServletContainer</servlet-class>
<init-param>
<param-name>com.sun.jersey.config.property.packages</param-name>
<param-value>com.netflix.simianarmy</param-value>
<param-value>com.netflix.simianarmy.resources</param-value>
</init-param>
<load-on-startup>1</load-on-startup>
</servlet>
Expand Down
11 changes: 6 additions & 5 deletions ...ic/chaos/TestBasicChaosMonkeyServlet.java → ...sources/chaos/TestChaosMonkeyServlet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* limitations under the License.
*
*/
package com.netflix.simianarmy.basic.chaos;
package com.netflix.simianarmy.resources.chaos;

import java.util.Arrays;
import java.util.Date;
Expand Down Expand Up @@ -44,14 +44,15 @@
import com.netflix.simianarmy.MonkeyRecorder;
import com.netflix.simianarmy.chaos.ChaosMonkey;
import com.netflix.simianarmy.basic.BasicRecorderEvent;
import com.netflix.simianarmy.basic.chaos.BasicChaosMonkey;

import com.netflix.simianarmy.chaos.TestChaosMonkeyContext;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

public class TestBasicChaosMonkeyServlet {
private static final Logger LOGGER = LoggerFactory.getLogger(TestBasicChaosMonkeyServlet.class);
public class TestChaosMonkeyServlet {
private static final Logger LOGGER = LoggerFactory.getLogger(TestChaosMonkeyServlet.class);

@Captor
private ArgumentCaptor<Enum> monkeyTypeArg;
Expand All @@ -76,7 +77,7 @@ public void init() {
public void testServlet() {
MonkeyRunner.getInstance().replaceMonkey(BasicChaosMonkey.class, MockTestChaosMonkeyContext.class);

BasicChaosMonkey.Servlet servlet = new BasicChaosMonkey.Servlet();
ChaosMonkeyServlet servlet = new ChaosMonkeyServlet();

MultivaluedMap<String, String> queryParams = new MultivaluedMapImpl();
queryParams.add("groupType", "ASG");
Expand Down Expand Up @@ -127,6 +128,6 @@ public MonkeyRecorder recorder() {

String getResource(String name) {
// get resource as stream, use Scanner to read stream as one token
return new Scanner(TestBasicChaosMonkey.class.getResourceAsStream(name), "UTF-8").useDelimiter("\\A").next();
return new Scanner(TestChaosMonkeyServlet.class.getResourceAsStream(name), "UTF-8").useDelimiter("\\A").next();
}
}
0 ...y/basic/chaos/getChaosEventsResponse.json → ...sources/chaos/getChaosEventsResponse.json
View file
Open in desktop
File renamed without changes.