jdbcconfig: Don't use jdbcstore for logging.xml

geoserver · Apr 14, 2017 · f62b0f8 · f62b0f8
1 parent dced227
commit f62b0f8
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/...mmunity/jdbcconfig/src/main/java/org/geoserver/jdbcconfig/config/JDBCGeoServerFacade.java b/...mmunity/jdbcconfig/src/main/java/org/geoserver/jdbcconfig/config/JDBCGeoServerFacade.java
@@ -40,6 +40,7 @@
 import org.geoserver.ows.util.OwsUtils;
 import org.geoserver.ows.util.ClassProperties;
 import org.geoserver.platform.GeoServerResourceLoader;
+import org.geoserver.platform.resource.ResourceStore;
 import org.geotools.util.logging.Logging;
 import org.opengis.filter.Filter;
 import org.opengis.filter.sort.SortBy;
@@ -60,11 +61,17 @@ public class JDBCGeoServerFacade implements GeoServerFacade {
 
     private final ConfigDatabase db;
 
+    private ResourceStore ddResourceStore;
+
     private GeoServerResourceLoader resourceLoader;
 
     public void setResourceLoader(GeoServerResourceLoader resourceLoader) {
         this.resourceLoader = resourceLoader;
     }
+
+    public void setDdResourceStore(ResourceStore ddResourceStore) {
+        this.ddResourceStore = ddResourceStore;
+    }
 
     public JDBCGeoServerFacade(final ConfigDatabase db) {
         this.db = db;
@@ -77,7 +84,8 @@ private void reinitializeLogging() {
             if (realLogInfo == null) {
                 return;
             }
-            LoggingInfo startLogInfo = LoggingStartupContextListener.getLogging(resourceLoader);
+            LoggingInfo startLogInfo = LoggingStartupContextListener.getLogging(
+                    ddResourceStore == null ? resourceLoader : ddResourceStore);
 
             // Doing this reflectively so that if LoggingInfo gets new properties, this should still
             // work. KS

diff --git a/src/community/jdbcconfig/src/main/resources/applicationContext.xml b/src/community/jdbcconfig/src/main/resources/applicationContext.xml
@@ -43,6 +43,7 @@
   <bean id="JDBCGeoServerFacade" class="org.geoserver.jdbcconfig.config.JDBCGeoServerFacade">
     <constructor-arg ref="JDBCConfigDB" />
     <property name="resourceLoader" ref="resourceLoader" />
+    <property name="ddResourceStore" ref="dataDirectoryResourceStore" />
   </bean>
 
   <bean id="JDBCGeoServerLoader" class="org.geoserver.jdbcconfig.JDBCGeoServerLoader">

diff --git a/src/main/src/main/java/org/geoserver/logging/LoggingStartupContextListener.java b/src/main/src/main/java/org/geoserver/logging/LoggingStartupContextListener.java
@@ -7,7 +7,6 @@
 
 import java.io.BufferedInputStream;
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.IOException;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -24,6 +23,7 @@
 import org.geoserver.platform.GeoServerExtensions;
 import org.geoserver.platform.GeoServerResourceLoader;
 import org.geoserver.platform.resource.Resource;
+import org.geoserver.platform.resource.ResourceStore;
 import org.geotools.util.logging.CommonsLoggerFactory;
 import org.geotools.util.logging.Log4JLoggerFactory;
 import org.geotools.util.logging.Logging;
@@ -67,7 +67,6 @@ public void contextInitialized(ServletContextEvent event) {
                 File baseDir = new File(GeoServerResourceLoader.lookupGeoServerDataDirectory(context));
                 GeoServerResourceLoader loader = new GeoServerResourceLoader(baseDir);
 
-                File f= loader.find( "logging.xml" );
                 LoggingInfo loginfo = getLogging(loader);
                 if ( loginfo != null ) {
                     final String location = LoggingUtils.getLogFileLocation(loginfo.getLocation(), event.getServletContext());
@@ -76,7 +75,7 @@ public void contextInitialized(ServletContextEvent event) {
                 }
                 else {
                     //check for old style data directory
-                    f = loader.find( "services.xml" );
+                    File f = loader.find( "services.xml" );
                     if ( f != null ) {
                         LegacyLoggingImporter loggingImporter = new LegacyLoggingImporter();
                         loggingImporter.imprt(baseDir);
@@ -102,11 +101,11 @@ public void contextInitialized(ServletContextEvent event) {
      * exist
      */
     @Deprecated
-    public static @Nullable LoggingInfo getLogging(GeoServerResourceLoader loader) throws IOException {
+    public static @Nullable LoggingInfo getLogging(ResourceStore store) throws IOException {
         // Exposing this is a hack to provide JDBCConfig with the information it needs to compute
         // the "change" between logging.xml and the versions stored in JDBC. KS
         // TODO find a better solution than re-initializing on JDBCCOnfig startup.
-        Resource f= loader.get( "logging.xml" );
+        Resource f= store.get( "logging.xml" );
         if ( f != null ) {
             XStreamPersister xp = new XStreamPersisterFactory().createXMLPersister();
             try (BufferedInputStream in = new BufferedInputStream(f.in())) {