VladPolskiy/openstreetmap-mod_tile-python-implementation
1
0
Fork 0
mirror of https://github.com/openstreetmap/mod_tile.git synced 2025-07-25 15:04:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow renderd* sections to follow map sections in renderd.conf (#308)

Browse Source 
* Allow `renderd*` sections to precede `map` sections in config file

* Adding test

* astyle formatting
This commit is contained in:
Hummeltech
2023-03-09 08:58:00 -07:00
committed by GitHub
parent be0d5fe256
commit f521540df1
4 changed files with 114 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tests/CMakeLists.txt
View File

@ -103,8 +103,10 @@ add_test(
add_test(
NAME start_renderd
COMMAND ${BASH} -c "
echo '${PROJECT_BINARY_DIR}/src/renderd --config ${PROJECT_BINARY_DIR}/tests/conf/renderd.conf --foreground > ${PROJECT_BINARY_DIR}/tests/logs/renderd.log 2>&1 &' > ${PROJECT_BINARY_DIR}/tests/renderd_start.sh
echo '${PROJECT_BINARY_DIR}/src/renderd --config ${PROJECT_BINARY_DIR}/tests/conf/renderd.conf --foreground --slave 0 > ${PROJECT_BINARY_DIR}/tests/logs/renderd.log 2>&1 &' > ${PROJECT_BINARY_DIR}/tests/renderd_start.sh
echo 'printf \${!} > ${PROJECT_BINARY_DIR}/tests/run/renderd.pid' >> ${PROJECT_BINARY_DIR}/tests/renderd_start.sh
echo '${PROJECT_BINARY_DIR}/src/renderd --config ${PROJECT_BINARY_DIR}/tests/conf/renderd.conf --foreground --slave 1 > ${PROJECT_BINARY_DIR}/tests/logs/renderd1.log 2>&1 &' >> ${PROJECT_BINARY_DIR}/tests/renderd_start.sh
echo 'printf \${!} > ${PROJECT_BINARY_DIR}/tests/run/renderd1.pid' >> ${PROJECT_BINARY_DIR}/tests/renderd_start.sh
echo 'exit 0' >> ${PROJECT_BINARY_DIR}/tests/renderd_start.sh
${BASH} ${PROJECT_BINARY_DIR}/tests/renderd_start.sh
"
@ -156,6 +158,7 @@ add_test(
NAME stop_renderd
COMMAND ${BASH} -c "
${KILL_EXECUTABLE} $(${CAT_EXECUTABLE} run/renderd.pid) && ${RM} run/renderd.pid
${KILL_EXECUTABLE} $(${CAT_EXECUTABLE} run/renderd1.pid) && ${RM} run/renderd1.pid
"
)
add_test(

23
tests/httpd.conf.in
View File

@ -36,10 +36,33 @@ Redirect /renderd-example-map/leaflet/leaflet.min.js https://unpkg.com/leaflet/d
ModTileTileDir @PROJECT_BINARY_DIR@/tests/tiles
</VirtualHost>
<VirtualHost *:8181>
LoadTileConfigFile @PROJECT_BINARY_DIR@/tests/conf/renderd.conf
ModTileBulkMode Off
ModTileCacheDurationDirty 900
ModTileCacheDurationLowZoom 9 518400
ModTileCacheDurationMax 604800
ModTileCacheDurationMediumZoom 13 86400
ModTileCacheDurationMinimum 10800
ModTileCacheLastModifiedFactor 0.20
ModTileEnableStats On
ModTileEnableTileThrottling Off
ModTileEnableTileThrottlingXForward 0
ModTileMaxLoadMissing 5
ModTileMaxLoadOld 2
ModTileMissingRequestTimeout 10
ModTileRenderdSocketAddr 127.0.0.1 8881
ModTileRequestTimeout 3
ModTileThrottlingRenders 128 0.2
ModTileThrottlingTiles 10000 1
ModTileTileDir @PROJECT_BINARY_DIR@/tests/tiles
</VirtualHost>
CustomLog logs/access_log "%h %l %u %t \"%r\" %>s %b"
ErrorLog logs/error_log
Group @NOGROUP_NAME@
Listen 8081
Listen 8181
LogLevel debug
PidFile run/httpd.pid
ServerName localhost

19
tests/renderd.conf.in
View File

@ -1,9 +1,3 @@
[renderd]
pid_file=@PROJECT_BINARY_DIR@/tests/run/renderd.pid
socketname=@PROJECT_BINARY_DIR@/tests/run/renderd.sock
stats_file=@PROJECT_BINARY_DIR@/tests/run/renderd.stats
tile_dir=@PROJECT_BINARY_DIR@/tests/tiles
[mapnik]
font_dir_recurse=true
font_dir=@MAPNIK_FONTS_DIR@
@ -13,3 +7,16 @@ plugins_dir=@MAPNIK_PLUGINS_DIR@
TILEDIR=@PROJECT_BINARY_DIR@/tests/tiles
URI=/tiles/renderd-example
XML=@PROJECT_BINARY_DIR@/tests/www/mapnik.xml
[renderd1]
iphostname=127.0.0.1
ipport=8881
pid_file=@PROJECT_BINARY_DIR@/tests/run/renderd1.pid
stats_file=@PROJECT_BINARY_DIR@/tests/run/renderd1.stats
tile_dir=@PROJECT_BINARY_DIR@/tests/tiles
[renderd]
pid_file=@PROJECT_BINARY_DIR@/tests/run/renderd.pid
socketname=@PROJECT_BINARY_DIR@/tests/run/renderd.sock
stats_file=@PROJECT_BINARY_DIR@/tests/run/renderd.stats
tile_dir=@PROJECT_BINARY_DIR@/tests/tiles