Skip to content

armgit / core

Public Imported from GitHub
0

100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps

Added caching (varnish cache) to map container

Rich Turnerf682348117e2
diff --git a/manager/src/main/java/org/openremote/manager/map/MapService.java b/manager/src/main/java/org/openremote/manager/map/MapService.java
index e14fb7cf9..159a355c2 100644
--- a/manager/src/main/java/org/openremote/manager/map/MapService.java
+++ b/manager/src/main/java/org/openremote/manager/map/MapService.java
@@ -21,6 +21,8 @@ package org.openremote.manager.map;
import io.undertow.server.HttpHandler;
import io.undertow.server.handlers.ResponseCodeHandler;
+import io.undertow.server.handlers.cache.CacheHandler;
+import io.undertow.server.handlers.cache.DirectBufferCache;
import io.undertow.server.handlers.proxy.ProxyHandler;
import org.openremote.container.Container;
import org.openremote.container.ContainerService;
@@ -185,6 +187,8 @@ public class MapService implements ContainerService {
proxyHandler.handleRequest(exchange);
};
+ CacheHandler cacheHandler = new CacheHandler(new DirectBufferCache())
+
webService.getRequestHandlers().add(0, pathStartsWithHandler("Raster Map Tile Proxy", RASTER_MAP_TILE_PATH, proxyWrapper));
}
}
diff --git a/map/Dockerfile b/map/Dockerfile
index 88970f086..29c937aca 100644
--- a/map/Dockerfile
+++ b/map/Dockerfile
@@ -1,11 +1,22 @@
-# This just adds the ability to run behind reverse proxy with a non empty path (i.e. /map) to tileserver-gl; they seem
-# reluctant to add this functionality despite users requesting it so this just pulls down PR and uses that instead
-# see https://github.com/klokantech/tileserver-gl/pull/230
+# Adds varnish-cache to the container to improve raster tile serving
FROM klokantech/tileserver-gl
MAINTAINER [email protected]
RUN mkdir -p /server
WORKDIR /server
COPY config.json .
COPY fonts fonts
+
+
+RUN apt-get -qq update \
+&& apt-get upgrade -yqq \
+&& DEBIAN_FRONTEND=noninteractive apt-get -y install \
+ varnish \
+&& apt-get clean
+
+ADD default.vcl /etc/varnish/default.vcl
+ADD start.sh /start.sh
+
+ENTRYPOINT ["/bin/bash", "/start.sh"]
+
WORKDIR /data
CMD ["-c", "/server/config.json"]
\ No newline at end of file
diff --git a/map/default.vcl b/map/default.vcl
new file mode 100644
index 000000000..70e777fc4
--- /dev/null
+++ b/map/default.vcl
@@ -0,0 +1,10 @@
+vcl 4.0;
+
+sub vcl_recv {
+ unset req.http.Cookie;
+}
+
+backend default {
+ .host = "127.0.0.1";
+ .port = "8080";
+}
\ No newline at end of file
diff --git a/map/start.sh b/map/start.sh
new file mode 100644
index 000000000..f41b4a54b
--- /dev/null
+++ b/map/start.sh
@@ -0,0 +1,27 @@
+#!/bin/bash
+
+_term() {
+ echo "Caught signal, stopping gracefully"
+ kill -TERM "$child" 2>/dev/null
+}
+
+trap _term TERM
+
+varnishd -f /etc/varnish/default.vcl -s malloc,100M -a 0.0.0.0:80
+
+# Delete files if they were not cleaned by last run
+rm -rf /tmp/.X11-unix /tmp/.X99-lock
+
+start-stop-daemon --start --pidfile ~/xvfb.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -screen 0 1024x768x24 -ac +extension GLX +render -noreset
+echo "Waiting 3 seconds for xvfb to start..."
+sleep 3
+
+export DISPLAY=:99.0
+
+cd /data
+node /usr/src/app/ -p 8080 "$@" &
+child=$!
+wait "$child"
+
+start-stop-daemon --stop --retry 5 --pidfile ~/xvfb.pid # stop xvfb when exiting
+rm ~/xvfb.pid
\ No newline at end of file