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

Supporting jclouds drivers by retrieving the configured logger factory using LoggingModules

This commit is contained in:
Andrew Phillips 2012-04-11 01:38:04 -04:00
parent e852a9d94b
commit ae22bde4ad
2 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
demos/tweetstore/gae-tweetstore-spring/src/main/java/org/jclouds/demo/tweetstore/config/LoggingConfig.java
View File

@ -18,9 +18,9 @@
*/ */
package org.jclouds.demo.tweetstore.config; package org.jclouds.demo.tweetstore.config;
import org.jclouds.logging.Logger; import static org.jclouds.logging.LoggingModules.firstOrJDKLoggingModule;
import org.jclouds.logging.Logger.LoggerFactory; import org.jclouds.logging.Logger.LoggerFactory;
import org.jclouds.logging.jdk.JDKLogger;
/** /**
* Spring config that provides a logger. * Spring config that provides a logger.
@ -28,11 +28,5 @@ import org.jclouds.logging.jdk.JDKLogger;
* @author Andrew Phillips * @author Andrew Phillips
*/ */
abstract class LoggingConfig { abstract class LoggingConfig {
private static final LoggerFactory FACTORY = new JDKLogger.JDKLoggerFactory(); protected static final LoggerFactory LOGGER_FACTORY = firstOrJDKLoggingModule().createLoggerFactory();
protected final Logger logger;
protected LoggingConfig() {
logger = FACTORY.getLogger(this.getClass().getName());
}
} }

23
demos/tweetstore/gae-tweetstore-spring/src/main/java/org/jclouds/demo/tweetstore/config/SpringServletConfig.java
View File

@ -50,6 +50,7 @@ import org.jclouds.demo.tweetstore.controller.EnqueueStoresController;
import org.jclouds.demo.tweetstore.controller.StoreTweetsController; import org.jclouds.demo.tweetstore.controller.StoreTweetsController;
import org.jclouds.demo.tweetstore.functions.ServiceToStoredTweetStatuses; import org.jclouds.demo.tweetstore.functions.ServiceToStoredTweetStatuses;
import org.jclouds.gae.config.GoogleAppEngineConfigurationModule; import org.jclouds.gae.config.GoogleAppEngineConfigurationModule;
import org.jclouds.logging.Logger;
import org.springframework.beans.factory.BeanCreationException; import org.springframework.beans.factory.BeanCreationException;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
@ -81,6 +82,8 @@ import com.google.inject.Module;
public class SpringServletConfig extends LoggingConfig implements ServletConfigAware { public class SpringServletConfig extends LoggingConfig implements ServletConfigAware {
public static final String PROPERTY_BLOBSTORE_CONTEXTS = "blobstore.contexts"; public static final String PROPERTY_BLOBSTORE_CONTEXTS = "blobstore.contexts";
private static final Logger LOGGER = LOGGER_FACTORY.getLogger(SpringServletConfig.class.getName());
private ServletConfig servletConfig; private ServletConfig servletConfig;
private Map<String, BlobStoreContext> providerTypeToBlobStoreMap; private Map<String, BlobStoreContext> providerTypeToBlobStoreMap;
@ -93,7 +96,7 @@ public class SpringServletConfig extends LoggingConfig implements ServletConfigA
BlobStoreContextFactory blobStoreContextFactory = new BlobStoreContextFactory(); BlobStoreContextFactory blobStoreContextFactory = new BlobStoreContextFactory();
Properties props = loadJCloudsProperties(); Properties props = loadJCloudsProperties();
logger.trace("About to initialize members."); LOGGER.trace("About to initialize members.");
Module googleModule = new GoogleAppEngineConfigurationModule(); Module googleModule = new GoogleAppEngineConfigurationModule();
Set<Module> modules = ImmutableSet.<Module> of(googleModule); Set<Module> modules = ImmutableSet.<Module> of(googleModule);
@ -121,7 +124,7 @@ public class SpringServletConfig extends LoggingConfig implements ServletConfigA
// get a queue for submitting store tweet requests // get a queue for submitting store tweet requests
queue = QueueFactory.getQueue("twitter"); queue = QueueFactory.getQueue("twitter");
logger.trace("Members initialized. Twitter: '%s', container: '%s', provider types: '%s'", twitterClient, LOGGER.trace("Members initialized. Twitter: '%s', container: '%s', provider types: '%s'", twitterClient,
container, providerTypeToBlobStoreMap.keySet()); container, providerTypeToBlobStoreMap.keySet());
} }
@ -136,7 +139,7 @@ public class SpringServletConfig extends LoggingConfig implements ServletConfigA
} }
private Properties loadJCloudsProperties() { private Properties loadJCloudsProperties() {
logger.trace("About to read properties from '%s'", "/WEB-INF/jclouds.properties"); LOGGER.trace("About to read properties from '%s'", "/WEB-INF/jclouds.properties");
Properties props = new Properties(); Properties props = new Properties();
InputStream input = servletConfig.getServletContext().getResourceAsStream("/WEB-INF/jclouds.properties"); InputStream input = servletConfig.getServletContext().getResourceAsStream("/WEB-INF/jclouds.properties");
try { try {
@ -146,7 +149,7 @@ public class SpringServletConfig extends LoggingConfig implements ServletConfigA
} finally { } finally {
Closeables.closeQuietly(input); Closeables.closeQuietly(input);
} }
logger.trace("Properties successfully read."); LOGGER.trace("Properties successfully read.");
return props; return props;
} }
@ -171,13 +174,13 @@ public class SpringServletConfig extends LoggingConfig implements ServletConfigA
} }
private void injectServletConfig(Servlet servlet) { private void injectServletConfig(Servlet servlet) {
logger.trace("About to inject servlet config '%s'", servletConfig); LOGGER.trace("About to inject servlet config '%s'", servletConfig);
try { try {
servlet.init(checkNotNull(servletConfig)); servlet.init(checkNotNull(servletConfig));
} catch (ServletException exception) { } catch (ServletException exception) {
throw new BeanCreationException("Unable to instantiate " + servlet, exception); throw new BeanCreationException("Unable to instantiate " + servlet, exception);
} }
logger.trace("Successfully injected servlet config."); LOGGER.trace("Successfully injected servlet config.");
} }
@Bean @Bean
@ -208,14 +211,14 @@ public class SpringServletConfig extends LoggingConfig implements ServletConfigA
@PreDestroy @PreDestroy
public void destroy() throws Exception { public void destroy() throws Exception {
logger.trace("About to close contexts."); LOGGER.trace("About to close contexts.");
for (BlobStoreContext context : providerTypeToBlobStoreMap.values()) { for (BlobStoreContext context : providerTypeToBlobStoreMap.values()) {
context.close(); context.close();
} }
logger.trace("Contexts closed."); LOGGER.trace("Contexts closed.");
logger.trace("About to purge request queue."); LOGGER.trace("About to purge request queue.");
queue.purge(); queue.purge();
logger.trace("Request queue purged."); LOGGER.trace("Request queue purged.");
} }
/* /*