webassembletool-commits Mailing List for EsiGate (Page 3)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 1549
          http://sourceforge.net/p/webassembletool/code/1549
Author:   fxbonnet
Date:     2014-01-27 10:56:35 +0000 (Mon, 27 Jan 2014)
Log Message:
-----------
0000291: Enable ConfigReloadOnChange extension even without esigate.config system property defined
https://sourceforge.net/apps/mantisbt/webassembletool/view.php?id=291

Modified Paths:
--------------
    trunk/esigate-core/src/main/java/org/esigate/DriverFactory.java
    trunk/esigate-core/src/main/java/org/esigate/extension/ConfigReloadOnChange.java

Modified: trunk/esigate-core/src/main/java/org/esigate/DriverFactory.java
===================================================================

--- trunk/esigate-core/src/main/java/org/esigate/DriverFactory.java	2014-01-27 10:17:49 UTC (rev 1548)
+++ trunk/esigate-core/src/main/java/org/esigate/DriverFactory.java	2014-01-27 10:56:35 UTC (rev 1549)
@@ -18,10 +18,10 @@
 import static org.apache.commons.lang3.StringUtils.defaultIfBlank;
 
 import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
+import java.net.MalformedURLException;
+import java.net.URL;
 import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.Map;
@@ -74,38 +74,15 @@
         InputStream extInputStream = null;
 
         try {
-            // Load from environment
-            String envPath = System.getProperty(PROP_CONF_LOCATION);
-            if (envPath != null) {
-                try {
-                    LOG.info("Scanning configuration {}", envPath);
-                    inputStream = new FileInputStream(new File(envPath));
-                } catch (FileNotFoundException e) {
-                    LOG.error("Can't read file {} (from -D" + PROP_CONF_LOCATION + ")", envPath, e);
-                }
-            }
+            URL configUrl = getConfigUrl();
 
-            if (inputStream == null) {
-                LOG.info("Scanning configuration {}", "/esigate.properties");
-                inputStream = DriverFactory.class.getResourceAsStream("/esigate.properties");
-            }
-
-            // For backward compatibility
-            if (inputStream == null) {
-                LOG.info("Scanning configuration /{}/{}", DriverFactory.class.getPackage().getName().replace(".", "/"),
-                        "driver.properties");
-                inputStream = DriverFactory.class.getResourceAsStream("driver.properties");
-            }
-            if (inputStream == null) {
-                LOG.info("Scanning configuration {}", "/net/webassembletool/driver.properties");
-                inputStream = DriverFactory.class.getResourceAsStream("/net/webassembletool/driver.properties");
-            }
-
-            if (inputStream == null) {
+            if (configUrl == null) {
                 throw new ConfigurationException("esigate.properties configuration file "
                         + "was not found in the classpath");
             }
 
+            inputStream = configUrl.openStream();
+
             // load driver-ext.properties if exists
             LOG.info("Scanning configuration {}", "/esigate-ext.properties");
             extInputStream = DriverFactory.class.getClassLoader().getResourceAsStream("/esigate-ext.properties");
@@ -306,4 +283,39 @@
             configure();
         }
     }
+
+    /**
+     * @return The URL of the configuration file.
+     */
+    public static URL getConfigUrl() {
+        URL configUrl = null;
+        // Load from environment
+        String envPath = System.getProperty(PROP_CONF_LOCATION);
+        if (envPath != null) {
+            try {
+                LOG.info("Scanning configuration {}", envPath);
+                configUrl = new File(envPath).toURI().toURL();
+            } catch (MalformedURLException e) {
+                LOG.error("Can't read file {} (from -D" + PROP_CONF_LOCATION + ")", envPath, e);
+            }
+        }
+
+        if (configUrl == null) {
+            LOG.info("Scanning configuration {}", "/esigate.properties");
+            configUrl = DriverFactory.class.getResource("/esigate.properties");
+        }
+
+        // For backward compatibility
+        if (configUrl == null) {
+            LOG.info("Scanning configuration /{}/{}", DriverFactory.class.getPackage().getName().replace(".", "/"),
+                    "driver.properties");
+            configUrl = DriverFactory.class.getResource("driver.properties");
+        }
+        if (configUrl == null) {
+            LOG.info("Scanning configuration {}", "/net/webassembletool/driver.properties");
+            configUrl = DriverFactory.class.getResource("/net/webassembletool/driver.properties");
+        }
+        return configUrl;
+    }
+
 }

Modified: trunk/esigate-core/src/main/java/org/esigate/extension/ConfigReloadOnChange.java
===================================================================
--- trunk/esigate-core/src/main/java/org/esigate/extension/ConfigReloadOnChange.java	2014-01-27 10:17:49 UTC (rev 1548)
+++ trunk/esigate-core/src/main/java/org/esigate/extension/ConfigReloadOnChange.java	2014-01-27 10:56:35 UTC (rev 1549)
@@ -15,6 +15,8 @@
 package org.esigate.extension;
 
 import java.io.File;
+import java.net.URISyntaxException;
+import java.net.URL;
 import java.util.Properties;
 
 import org.esigate.Driver;
@@ -119,8 +121,21 @@
         String envPath = System.getProperty("esigate.config");
         if (envPath != null) {
             configuration = new File(envPath);
+        } else {
+            URL configUrl = DriverFactory.getConfigUrl();
+            if (configUrl != null && "file".equalsIgnoreCase(configUrl.getProtocol())) {
+                try {
+                    configuration = new File(configUrl.toURI());
+                } catch (URISyntaxException e) {
+                    LOG.error("Unable to access configuration file", e);
+                }
+            }
         }
 
+        if (configuration != null && configuration.exists()) {
+            lastModified = configuration.lastModified();
+        }
+
         // Start watcher
         fileWatcher.start();
     }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.





2010	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct (3)	Nov (4)	Dec (2)
2011	Jan (2)	Feb (19)	Mar (20)	Apr (20)	May	Jun (3)	Jul	Aug (23)	Sep (2)	Oct (5)	Nov (58)	Dec (49)
2012	Jan (11)	Feb (20)	Mar (9)	Apr (19)	May (14)	Jun (42)	Jul (13)	Aug	Sep (6)	Oct (6)	Nov (22)	Dec (66)
2013	Jan (12)	Feb (28)	Mar (54)	Apr (21)	May (7)	Jun (69)	Jul (80)	Aug (7)	Sep (12)	Oct (145)	Nov (44)	Dec (25)
2014	Jan (33)	Feb (21)	Mar (19)	Apr (2)	May	Jun (3)	Jul	Aug	Sep	Oct	Nov	Dec

webassembletool-commits Mailing List for EsiGate (Page 3)

webassembletool-commits — ESIGate commit list