Reload charts in mapcache on restart of server

Author: rob42

pom.xml

@@ -14,8 +14,8 @@
 		<jetty.version>8.1.16.v20140903</jetty.version>
 		<!-- <jetty.version>9.2.9.v20150224</jetty.version> -->
 
-		<camel.version>2.15.2</camel.version>
-		<camel.core.version>2.15.2</camel.core.version>
+		<camel.version>2.15.6</camel.version>
+		<camel.core.version>2.15.6</camel.core.version>
 		<jna.version>4.0.0</jna.version>
 		<apollo.version>1.7.1</apollo.version>
 		<activemq.version>5.11.1</activemq.version>
@@ -262,6 +262,12 @@
 		    <groupId>org.apache.camel</groupId>
 		    <artifactId>camel-ahc-ws</artifactId>
 		    <version>${camel.version}</version>
+		    <exclusions>
+		    	<exclusion>
+		    		<artifactId>netty</artifactId>
+		    		<groupId>io.netty</groupId>
+		    	</exclusion>
+		    </exclusions>
 		</dependency>
 		<dependency>
    			<groupId>org.apache.camel</groupId>
@@ -417,6 +423,12 @@
 			<artifactId>async-http-client</artifactId>
 			<version>1.8.14</version>
 			<scope>test</scope>
+<!-- 			<exclusions> -->
+<!-- 				<exclusion> -->
+<!-- 					<artifactId>netty</artifactId> -->
+<!-- 					<groupId>io.netty</groupId> -->
+<!-- 				</exclusion> -->
+<!-- 			</exclusions> --> 
 		</dependency>
 		<dependency>
 			<groupId>org.fusesource.mqtt-client</groupId>

src/main/java/nz/co/fortytwo/signalk/processor/UploadProcessor.java

@@ -159,12 +159,24 @@ private void install(Path destination) throws Exception {
 			ZipUtils.unzip(destDir, zipFile);
 			logger.debug("Unzipped file:"+destDir);
 			//now add a reference in resources
-			
+			loadChart(f);
+		}catch(Exception e){
+			logger.error(e.getMessage(),e);
+			throw e;
+		}
+	}
+	
+	public void loadChart(String chartName) throws Exception{
+		try{
+			 File destDir = new File(Util.getConfigProperty(STATIC_DIR)+Util.getConfigProperty(MAP_DIR)+chartName);
 			 SAXReader reader = new SAXReader();
 		     Document document = reader.read(new File(destDir, "tilemapresource.xml"));
 
 		     String title = document.getRootElement().element("Title").getText();
-		     String scale = document.getRootElement().element("Metadata").attribute("scale").getText();
+		     String scale = "250000";
+		     if(document.getRootElement().element("Metadata")!=null){
+		    	 scale = document.getRootElement().element("Metadata").attribute("scale").getText();
+		     }
 		     double maxRes = 0.0;
 		     double minRes = Double.MAX_VALUE;
 		     int maxZoom = 0;
@@ -180,7 +192,7 @@ private void install(Path destination) throws Exception {
 		    	 minRes=Math.min(units, minRes);
 		     }
 		     //now make an entry in resources
-		     Json resource = createChartMsg(f, title, scale);
+		     Json resource = createChartMsg(chartName, title, scale);
 		     inProducer.asyncSendBody(inProducer.getDefaultEndpoint(),resource);
 		}catch(Exception e){
 			logger.error(e.getMessage(),e);

src/main/java/nz/co/fortytwo/signalk/server/RouteManager.java

@@ -23,7 +23,9 @@
  */
 package nz.co.fortytwo.signalk.server;
 
+import static nz.co.fortytwo.signalk.util.ConfigConstants.MAP_DIR;
 import static nz.co.fortytwo.signalk.util.ConfigConstants.OUTPUT_XMPP;
+import static nz.co.fortytwo.signalk.util.ConfigConstants.STATIC_DIR;
 import static nz.co.fortytwo.signalk.util.SignalKConstants.DEMO;
 //import static nz.co.fortytwo.signalk.util.ConfigConstants.UUID;
 import static nz.co.fortytwo.signalk.util.SignalKConstants.FORMAT_DELTA;
@@ -77,6 +79,7 @@
 import mjson.Json;
 import nz.co.fortytwo.signalk.model.SignalKModel;
 import nz.co.fortytwo.signalk.model.impl.SignalKModelFactory;
+import nz.co.fortytwo.signalk.processor.UploadProcessor;
 import nz.co.fortytwo.signalk.util.ConfigConstants;
 import nz.co.fortytwo.signalk.util.Util;
 
@@ -350,10 +353,10 @@ public void configure0() throws Exception {
 		//start any clients if they exist
 		//WS
 		Json wsClients = Util.getConfigJsonArray(ConfigConstants.CLIENT_WS);
-		logger.info("  Starting WS connection to url:"+wsClients);
+		logger.info("  WS client connections : "+wsClients);
 		if(wsClients!=null){
 			for(Object client: wsClients.asList()){
-				logger.info("  Starting WS connection to url:ahc-ws://"+client);
+				logger.info("  Starting WS client connection to url:ahc-ws://"+client);
 				WsEndpoint wsEndpoint = (WsEndpoint)getContext().getEndpoint("ahc-ws://"+client);
 				setupClient("ahc-ws://"+client,client.toString(),"ws");
 				wsEndpoint.connect();
@@ -410,6 +413,9 @@ public void configure0() throws Exception {
 				}
 			}
 		}
+		//reload charts into resources
+		reloadCharts();
+		
 		//restart support
 		from(JETTY_HTTP_0_0_0_0 + restPort + SIGNALK_RESTART).id("Restart route")
 			.setExchangePattern(ExchangePattern.InOut)
@@ -448,6 +454,23 @@ public void configure0() throws Exception {
 		}
 	}
 
+	private void reloadCharts() {
+		File mapDir = new File(Util.getConfigProperty(STATIC_DIR)+Util.getConfigProperty(MAP_DIR));
+		logger.debug("Reloading charts from: "+mapDir.getAbsolutePath());
+		UploadProcessor processor = new UploadProcessor();
+		for(File chart:mapDir.listFiles()){
+			if(chart.isDirectory()){
+				logger.debug("Reloading: "+chart.getName());
+				try {
+					processor.loadChart(chart.getName());
+				} catch (Exception e) {
+					logger.warn(e.getMessage());
+				}
+			}
+		}
+		
+	}
+
 	private void setupClient(String endpoint, String client, String serviceName) {
 		setupClient(getContext().getEndpoint(endpoint), client, serviceName);
 	}

src/test/java/nz/co/fortytwo/signalk/server/SubcribeWsTest.java

@@ -105,7 +105,7 @@ public void shouldGetSubscribeWsResponse() throws Exception {
         latch2.await(3, TimeUnit.SECONDS);
       //await messages
         String restUrl = json.at("endpoints").at("v1").at(websocketUrl).asString();
-        logger.debug("Open websocket at :"+restUrl);
+        logger.debug("Open websocket at: "+restUrl);
         WebSocket websocket = c.prepareGet(restUrl).setCookies(r1.getCookies()).execute(
                 new WebSocketUpgradeHandler.Builder()
                     .addWebSocketListener(new DefaultWebSocketListener() {