Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Issue 191: revised constants and made listener cleanup nodes on context destroyed

This commit is contained in:
Adrian Cole 2010-07-28 11:54:27 -07:00
parent ad4ae74066
commit 85a59468d8
2 changed files with 29 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
chef/core/src/main/java/org/jclouds/chef/reference/ChefConstants.java
View File

@ -68,5 +68,6 @@ public interface ChefConstants {
public static final String CHEF_LOGGER = "jclouds.chef"; public static final String CHEF_LOGGER = "jclouds.chef";
public static final String CHEF_SERVICE_CLIENT = "chef.service.client"; public static final String CHEF_SERVICE_CLIENT = "chef.service.client";
public static final String CHEF_NODENAME = "chef.nodename"; public static final String CHEF_NODE = "chef.node";
public static final String CHEF_ROLE = "chef.role";
} }

37
chef/servlet/src/main/java/org/jclouds/chef/servlet/ChefRegistrationListener.java
View File

@ -19,10 +19,12 @@
package org.jclouds.chef.servlet; package org.jclouds.chef.servlet;
import static com.google.common.base.Preconditions.checkNotNull; import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.base.Throwables.propagate;
import static com.google.common.collect.Iterables.concat; import static com.google.common.collect.Iterables.concat;
import static com.google.common.collect.Sets.newHashSet; import static com.google.common.collect.Sets.newHashSet;
import static java.util.Collections.singleton; import static java.util.Collections.singleton;
import static org.jclouds.chef.reference.ChefConstants.CHEF_NODENAME; import static org.jclouds.chef.reference.ChefConstants.CHEF_NODE;
import static org.jclouds.chef.reference.ChefConstants.CHEF_ROLE;
import static org.jclouds.chef.reference.ChefConstants.CHEF_SERVICE_CLIENT; import static org.jclouds.chef.reference.ChefConstants.CHEF_SERVICE_CLIENT;
import java.util.Enumeration; import java.util.Enumeration;
@ -38,16 +40,19 @@ import org.jclouds.chef.ChefAsyncClient;
import org.jclouds.chef.ChefClient; import org.jclouds.chef.ChefClient;
import org.jclouds.chef.ChefContext; import org.jclouds.chef.ChefContext;
import org.jclouds.chef.ChefService; import org.jclouds.chef.ChefService;
import org.jclouds.chef.reference.ChefConstants;
import org.jclouds.logging.Logger; import org.jclouds.logging.Logger;
import org.jclouds.logging.jdk.JDKLogger; import org.jclouds.logging.jdk.JDKLogger;
import org.jclouds.rest.RestContextFactory; import org.jclouds.rest.RestContextFactory;
import com.google.common.base.Throwables;
import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListenableFuture;
/** /**
* Registers a new node in Chef and binds its name to {@code chef.nodename} and * Registers a new node in Chef and binds its name to
* the {@link ChefService} to {@code chef.service.client} * {@link ChefConstants.CHEF_NODE}, its role to {@link ChefConstants.CHEF_ROLE}
* and the {@link ChefService} for the client to
* {@link ChefConstants.CHEF_SERVICE_CLIENT} upon initialized. Deletes the node
* and client when the context is destroyed.
* *
* @author Adrian Cole * @author Adrian Cole
*/ */
@ -67,7 +72,7 @@ public class ChefRegistrationListener implements ServletContextListener {
overrides.setProperty(propertyName, servletContextEvent.getServletContext().getInitParameter(propertyName)); overrides.setProperty(propertyName, servletContextEvent.getServletContext().getInitParameter(propertyName));
} }
String role = getInitParam(servletContextEvent, "chef.role"); String role = getInitParam(servletContextEvent, CHEF_ROLE);
logger.trace("creating validator connection"); logger.trace("creating validator connection");
@ -89,7 +94,8 @@ public class ChefRegistrationListener implements ServletContextListener {
} finally { } finally {
validatorService.getContext().close(); validatorService.getContext().close();
} }
servletContextEvent.getServletContext().setAttribute(CHEF_NODENAME, nodeName); servletContextEvent.getServletContext().setAttribute(CHEF_NODE, nodeName);
servletContextEvent.getServletContext().setAttribute(CHEF_ROLE, role);
servletContextEvent.getServletContext().setAttribute(CHEF_SERVICE_CLIENT, clientService); servletContextEvent.getServletContext().setAttribute(CHEF_SERVICE_CLIENT, clientService);
logger.debug("initialized"); logger.debug("initialized");
} catch (RuntimeException e) { } catch (RuntimeException e) {
@ -113,10 +119,10 @@ public class ChefRegistrationListener implements ServletContextListener {
logger.trace("nodeName %s not in %s", nodeName, names); logger.trace("nodeName %s not in %s", nodeName, names);
return nodeName; return nodeName;
} catch (InterruptedException e) { } catch (InterruptedException e) {
Throwables.propagate(e); propagate(e);
return null; return null;
} catch (ExecutionException e) { } catch (ExecutionException e) {
Throwables.propagate(e); propagate(e);
return null; return null;
} }
} }
@ -157,10 +163,21 @@ public class ChefRegistrationListener implements ServletContextListener {
return checkNotNull(servletContextEvent.getServletContext().getInitParameter(name)); return checkNotNull(servletContextEvent.getServletContext().getInitParameter(name));
} }
@SuppressWarnings("unchecked")
private static <T> T getContextAttributeOrNull(ServletContextEvent servletContextEvent, String name) {
return (T) servletContextEvent.getServletContext().getAttribute(name);
}
/**
* removes the node and client if found, and closes the client context.
*/
@Override @Override
public void contextDestroyed(ServletContextEvent servletContextEvent) { public void contextDestroyed(ServletContextEvent servletContextEvent) {
ChefService clientService = (ChefService) servletContextEvent.getServletContext().getAttribute( ChefService clientService = getContextAttributeOrNull(servletContextEvent, CHEF_SERVICE_CLIENT);
CHEF_SERVICE_CLIENT); String nodename = getContextAttributeOrNull(servletContextEvent, CHEF_NODE);
if (nodename != null && clientService != null) {
clientService.deleteAllClientsAndNodesInList(singleton(nodename));
}
if (clientService != null) { if (clientService != null) {
clientService.getContext().close(); clientService.getContext().close();
} }