Browse Source

Fixed a cache usage issue and a logging issue

master
Drew Short 11 years ago
parent
commit
5e0877dd4f
  1. 90
      src/main/java/com/sothr/imagetools/AppConfig.java
  2. 2
      src/main/scala/com/sothr/imagetools/Engine.scala

90
src/main/java/com/sothr/imagetools/AppConfig.java

@ -13,47 +13,57 @@ import java.util.Properties;
public class AppConfig { public class AppConfig {
private static Logger logger;
public static CacheManager cacheManager;
//Logging defaults
private static final String LOGSETTINGSFILE = "./log4j.properties";
private static Boolean configuredLogging = false;
//Properties defaults
private static final String DEFAULTPROPERTIESFILE = "default.properties";
private static final String USERPROPERTIESFILE = "./config.xml";
private static Boolean loadedProperties = false;
//Cache defaults
private static Boolean configuredCache = false;
public static void configureApp() {
//configSimpleLogging();
if (!configuredLogging) {
BasicConfigurator.configure();
loadProperties();
BasicConfigurator.resetConfiguration();
} else {
loadProperties();
}
configLogging();
configCache();
private static Logger logger;
public static CacheManager cacheManager;
//Logging defaults
private static final String LOGSETTINGSFILE = "./log4j.properties";
private static Boolean configuredLogging = false;
//Properties defaults
private static final String DEFAULTPROPERTIESFILE = "default.properties";
private static final String USERPROPERTIESFILE = "./config.xml";
private static Boolean loadedProperties = false;
//Cache defaults
private static Boolean configuredCache = false;
public static void configureApp() {
//configSimpleLogging();
if (!configuredLogging) {
configBasicLogging();
loadProperties();
resetBasicLogging();
} else {
loadProperties();
} }
configLogging();
configCache();
}
public static void configLogging(String location) {
//Logging Config
//remove previous configuration if it exists
//BasicConfigurator.resetConfiguration();
File file = new File(location);
Boolean fromFile = false;
if (file.exists()) {
fromFile = true;
PropertyConfigurator.configure(location);
} else {
//Simple error logging configuration
Properties defaultProps = new Properties();
String rootLogger = "DEBUG";
public static void configBasicLogging() {
BasicConfigurator.configure();
logger = LoggerFactory.getLogger(AppConfig.class);
}
public static void resetBasicLogging() {
logger = null;
BasicConfigurator.resetConfiguration();
}
public static void configLogging(String location) {
//Logging Config
//remove previous configuration if it exists
//BasicConfigurator.resetConfiguration();
File file = new File(location);
Boolean fromFile = false;
if (file.exists()) {
fromFile = true;
PropertyConfigurator.configure(location);
} else {
//Simple error logging configuration
Properties defaultProps = new Properties();
String rootLogger = "DEBUG";
if (Boolean.valueOf(PropertiesService.get(PropertiesEnum.LogDebug().toString()))) { if (Boolean.valueOf(PropertiesService.get(PropertiesEnum.LogDebug().toString()))) {
//Rolling Debug logger //Rolling Debug logger
rootLogger += ", DL"; rootLogger += ", DL";
@ -114,7 +124,7 @@ public class AppConfig {
PropertiesService.loadProperties(DEFAULTPROPERTIESFILE, null); PropertiesService.loadProperties(DEFAULTPROPERTIESFILE, null);
} }
loadedProperties = true; loadedProperties = true;
logger.info("Loaded properties");
logger.info("Loaded Properties");
} }
} }

2
src/main/scala/com/sothr/imagetools/Engine.scala

@ -23,7 +23,7 @@ class Engine() extends Logging{
debug(s"Found ${files.length} files that are images in directory: $directoryPath") debug(s"Found ${files.length} files that are images in directory: $directoryPath")
for (file <- files) { for (file <- files) {
if (imageCache.isKeyInCache(file.getAbsolutePath)) { if (imageCache.isKeyInCache(file.getAbsolutePath)) {
images += imageCache.get(file.getAbsolutePath).asInstanceOf[Image]
images += imageCache.get(file.getAbsolutePath).getObjectValue.asInstanceOf[Image]
} else { } else {
val image = ImageService.getImage(file) val image = ImageService.getImage(file)
imageCache.put(new Element(file.getAbsolutePath, image)) imageCache.put(new Element(file.getAbsolutePath, image))

Loading…
Cancel
Save