[Git][debian-gis-team/libapache2-mod-tile][master] 4 commits: New upstream version 0.4+git20200924-8d71103
Felix Delattre
gitlab at salsa.debian.org
Thu Sep 24 17:05:28 BST 2020
Felix Delattre pushed to branch master at Debian GIS Project / libapache2-mod-tile
Commits:
ca427e23 by Felix Delattre at 2020-09-24T12:03:55+00:00
New upstream version 0.4+git20200924-8d71103
- - - - -
935df9a4 by Felix Delattre at 2020-09-24T15:55:08+00:00
Update upstream source from tag 'upstream/0.4+git20200924-8d71103'
- - - - -
e11a04f0 by Felix Delattre at 2020-09-24T15:57:01+00:00
Built changelog with dch.
- - - - -
f782287f by Felix Delattre at 2020-09-24T16:01:32+00:00
Updated patches to fit new upstream version.
- - - - -
29 changed files:
- Makefile.am
- debian/changelog
- debian/patches/0005-replicate-seqences-tool-has-long-been-moved.patch → debian/patches/0002-replicate-seqences-tool-has-long-been-moved.patch
- debian/patches/0006-Change-to-fetch-minutely-updates-from-https-not-http.patch → debian/patches/0003-Change-to-fetch-minutely-updates-from-https-not-http.patch
- − debian/patches/0004-Move-variables-to-prevent-duplicates.patch
- − debian/patches/0007-Adhere-to-FHS-3.0-and-use-daemon-under-run.patch
- debian/patches/iniparser.patch
- − debian/patches/manpage-section-mismatch.patch
- debian/patches/series
- − debian/patches/spelling-errors.patch
- docs/renderd.8 → docs/renderd.1
- includes/daemon.h
- includes/protocol.h
- includes/render_submit_queue.h
- mod_tile.conf
- munin/renderd_processed
- munin/renderd_queue
- munin/renderd_queue_time
- munin/renderd_zoom
- munin/renderd_zoom_time
- openstreetmap-tiles-update-expire
- renderd.conf
- src/daemon.c
- src/mod_tile.c
- src/protocol_helper.c
- src/render_expired.c
- src/render_list.c
- src/render_old.c
- src/render_submit_queue.c
Changes:
=====================================
Makefile.am
=====================================
@@ -13,7 +13,7 @@ STORE_CPPFLAGS =
bin_PROGRAMS = renderd render_expired render_list render_speedtest render_old
noinst_PROGRAMS = gen_tile_test
-man_MANS = docs/renderd.8 docs/render_expired.1 docs/render_list.1 docs/render_old.1 docs/render_speedtest.1
+man_MANS = docs/renderd.1 docs/render_expired.1 docs/render_list.1 docs/render_old.1 docs/render_speedtest.1
renderddir = $(sysconfdir)
renderd_SOURCES = src/daemon.c src/daemon_compat.c src/gen_tile.cpp src/sys_utils.c src/request_queue.c src/cache_expire.c src/metatile.cpp src/parameterize_style.cpp src/protocol_helper.c $(STORE_SOURCES)
=====================================
debian/changelog
=====================================
@@ -1,3 +1,29 @@
+libapache2-mod-tile (0.4+git20200924-8d71103-1) UNRELEASED; urgency=medium
+
+ * Fixed ODbL formatting in copyright file.
+ * Added information about patches forwarded to upstream.
+ * Improved control file to responding to several lintian warnings.
+ * Removed lintian override as it doesn't seem to be necessary anymore.
+ * Added Documentation key and extended Description in systemd service file.
+ * Adjust naming of config files following lintian. Moved them into separate directories to avoid naming conflicts.
+ * Avoid recursive privilege change on directories during postinst.
+ * Fixed check for enabled mod_tile during installation.
+ * Moved config files in better subdirectory.
+ * Small improvements in commenting and dependencies as web app.
+ * Moved web app directory.
+ * Adjust wrong path in renderd-example-map related apache2 config.
+ * Make sure mod_tile is enabled on install of dependend packages.
+ * Handle example-map configuration.
+ * Leave to the admin to enable munin plugins.
+ * Change DEP-3 Forwarded to not-needed, when it came from the upstream repository.
+ * Removed Forwarded headers where there is Origin.
+ * Realigned .install maintainer scripts.
+ * Use Bug DEP-3 header to reference upstream reference.
+ * Adhere to FHS 3.0 and use daemon under /run.
+ * New upstream version 0.4+git20200924-8d71103
+
+ -- <fd at gfz-potsdam.de> Thu, 24 Sep 2020 15:56:28 +0000
+
libapache2-mod-tile (0.4+git20170108-e25bfdb-1) UNRELEASED; urgency=medium
* New upstream git snapshot.
@@ -6,20 +32,13 @@ libapache2-mod-tile (0.4+git20170108-e25bfdb-1) UNRELEASED; urgency=medium
* Bump Standards-Version to 4.5.0, no changes.
* Update watch file to limit matches to archive path.
* Update gbp.conf to use --source-only-changes by default.
- * Add renderd-example-map package and factor example data into it
- * Add patch to support newer g++ preventing dubplicate statements in code
- * Add patch to update urls of moved services
- * Add patch to update url for downloading data diff updates
* Add patch by Boris Shtrasman to use libiniparser package.
- * Switch to /var/cache/renderd for storing generated tiles
- * Run renderd as user _renderd
- * Add systemd service
* Add ${misc:Recommends} to libapache2-mod-tile.
- * Update copyright statements
* Drop renderd from Suggests, already part of Depends.
* Remove renderd.conf before dh_install, custom config installed instead.
* Fix install files.
* Add dependency on lsb-base required by init script.
+ * Add patch to use libjs-openlayers package.
* Add patch to fix spelling errors.
* Add lintian override for testsuite-autopkgtest-missing.
* Enable all hardening buildflags.
@@ -34,7 +53,7 @@ libapache2-mod-tile (0.4+git20170108-e25bfdb-1) UNRELEASED; urgency=medium
- Don't explicitly enable autoreconf, enabled by default
- Drop dh-autoreconf build dependency
- -- Felix Delattre <debian at xama.nu> Mon, 31 Aug 2020 20:00:00 +0000
+ -- Bas Couwenberg <sebastic at debian.org> Sun, 14 Jul 2019 13:26:28 +0200
libapache2-mod-tile (0.4-27~trusty1) trusty; urgency=low
=====================================
debian/patches/0005-replicate-seqences-tool-has-long-been-moved.patch → debian/patches/0002-replicate-seqences-tool-has-long-been-moved.patch
=====================================
@@ -10,7 +10,7 @@ As I'm not working at Personalwerk anymore, I moved the service to my own Server
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/openstreetmap-tiles-update-expire b/openstreetmap-tiles-update-expire
-index 220a19f..a0c6e5f 100755
+index b8bdc0d..717c4c6 100755
--- a/openstreetmap-tiles-update-expire
+++ b/openstreetmap-tiles-update-expire
@@ -75,7 +75,7 @@ if [ $# -eq 1 ] ; then
=====================================
debian/patches/0006-Change-to-fetch-minutely-updates-from-https-not-http.patch → debian/patches/0003-Change-to-fetch-minutely-updates-from-https-not-http.patch
=====================================
@@ -9,7 +9,7 @@ Bug: https://github.com/openstreetmap/mod_tile/pull/175/
1 file changed, 2 insertions(+)
diff --git a/openstreetmap-tiles-update-expire b/openstreetmap-tiles-update-expire
-index a0c6e5f..cdaa04b 100755
+index 717c4c6..03075d7 100755
--- a/openstreetmap-tiles-update-expire
+++ b/openstreetmap-tiles-update-expire
@@ -76,6 +76,8 @@ if [ $# -eq 1 ] ; then
=====================================
debian/patches/0004-Move-variables-to-prevent-duplicates.patch deleted
=====================================
@@ -1,102 +0,0 @@
-From: Jon Burgess <jburgess777 at gmail.com>
-Date: Sat, 23 May 2020 12:42:07 +0100
-Subject: Move variables to prevent duplicates
-Origin: https://github.com/openstreetmap/mod_tile/pull/202/commits/a22065b8ae3c018820a5ca9bf8e2b2bb0a0bfeb4
-Bug: https://github.com/openstreetmap/mod_tile/pull/202
-
----
- includes/daemon.h | 2 +-
- includes/render_submit_queue.h | 2 --
- src/daemon.c | 1 +
- src/render_expired.c | 1 -
- src/render_list.c | 1 -
- src/render_old.c | 1 -
- src/render_submit_queue.c | 1 +
- 7 files changed, 3 insertions(+), 6 deletions(-)
-
-diff --git a/includes/daemon.h b/includes/daemon.h
-index 85fa647..507fb83 100644
---- a/includes/daemon.h
-+++ b/includes/daemon.h
-@@ -45,7 +45,7 @@ typedef struct {
-
-
-
--struct request_queue * render_request_queue;
-+extern struct request_queue * render_request_queue;
-
- void statsRenderFinish(int z, long time);
- void request_exit(void);
-diff --git a/includes/render_submit_queue.h b/includes/render_submit_queue.h
-index 1183623..65b83fb 100644
---- a/includes/render_submit_queue.h
-+++ b/includes/render_submit_queue.h
-@@ -5,8 +5,6 @@ extern "C" {
- #endif
-
-
--int work_complete;
--
- void enqueue(const char *xmlname, int x, int y, int z);
- void spawn_workers(int num, const char *socketpath, int maxLoad);
- void wait_for_empty_queue(void);
-diff --git a/src/daemon.c b/src/daemon.c
-index d370463..e406500 100644
---- a/src/daemon.c
-+++ b/src/daemon.c
-@@ -49,6 +49,7 @@ static renderd_config config;
-
- int noSlaveRenders;
-
-+struct request_queue * render_request_queue;
-
- static const char *cmdStr(enum protoCmd c)
- {
-diff --git a/src/render_expired.c b/src/render_expired.c
-index 824d587..98177bd 100644
---- a/src/render_expired.c
-+++ b/src/render_expired.c
-@@ -89,7 +89,6 @@ unsigned long long twopow[MAX_ZOOM];
- static int minZoom = 0;
- static int maxZoom = 18;
- static int verbose = 0;
--int work_complete;
- static int maxLoad = MAX_LOAD_OLD;
-
- void display_rate(struct timeval start, struct timeval end, int num)
-diff --git a/src/render_list.c b/src/render_list.c
-index bc0f032..cb11c20 100644
---- a/src/render_list.c
-+++ b/src/render_list.c
-@@ -40,7 +40,6 @@ static int maxZoom = MAX_ZOOM;
- static int verbose = 0;
- static int maxLoad = MAX_LOAD_OLD;
-
--int work_complete;
-
- void display_rate(struct timeval start, struct timeval end, int num)
- {
-diff --git a/src/render_old.c b/src/render_old.c
-index 5e83cbd..42b12fc 100644
---- a/src/render_old.c
-+++ b/src/render_old.c
-@@ -47,7 +47,6 @@ static time_t planetTime;
- static struct timeval start, end;
-
-
--int work_complete;
-
- void display_rate(struct timeval start, struct timeval end, int num)
- {
-diff --git a/src/render_submit_queue.c b/src/render_submit_queue.c
-index 5d63987..0f850a6 100644
---- a/src/render_submit_queue.c
-+++ b/src/render_submit_queue.c
-@@ -47,6 +47,7 @@ static struct qItem *qHead, *qTail;
-
- static int no_workers;
- static pthread_t *workers;
-+static int work_complete;
-
- static void check_load(void)
- {
=====================================
debian/patches/0007-Adhere-to-FHS-3.0-and-use-daemon-under-run.patch deleted
=====================================
@@ -1,272 +0,0 @@
-From: Felix Delattre <fd at gfz-potsdam.de>
-Date: Thu, 3 Sep 2020 19:16:16 +0000
-Subject: Adhere to FHS 3.0 and use daemon under /run.
-Forwarded: https://github.com/openstreetmap/mod_tile/pull/213
-
----
- includes/protocol.h | 2 +-
- mod_tile.conf | 2 +-
- munin/renderd_processed | 12 +++++------
- munin/renderd_queue | 10 +++++-----
- munin/renderd_queue_time | 10 +++++-----
- munin/renderd_zoom | 42 +++++++++++++++++++--------------------
- munin/renderd_zoom_time | 42 +++++++++++++++++++--------------------
- openstreetmap-tiles-update-expire | 2 +-
- renderd.conf | 8 ++++----
- src/daemon.c | 2 +-
- 10 files changed, 66 insertions(+), 66 deletions(-)
-
-diff --git a/includes/protocol.h b/includes/protocol.h
-index 55ffc00..80209aa 100644
---- a/includes/protocol.h
-+++ b/includes/protocol.h
-@@ -17,7 +17,7 @@ extern "C" {
- */
- #define TILE_PATH_MAX (256)
- #define PROTO_VER (3)
--#define RENDER_SOCKET "/var/run/renderd/renderd.sock"
-+#define RENDER_SOCKET "/run/renderd/renderd.sock"
- #define XMLCONFIG_MAX 41
-
- enum protoCmd { cmdIgnore, cmdRender, cmdDirty, cmdDone, cmdNotDone, cmdRenderPrio, cmdRenderBulk, cmdRenderLow };
-diff --git a/mod_tile.conf b/mod_tile.conf
-index 8caa818..5a03caa 100644
---- a/mod_tile.conf
-+++ b/mod_tile.conf
-@@ -53,7 +53,7 @@ LoadModule tile_module modules/mod_tile.so
- ModTileVeryOldThreshold 31536000000000
-
- # Unix domain socket where we connect to the rendering daemon
-- ModTileRenderdSocketName /var/run/renderd/renderd.sock
-+ ModTileRenderdSocketName /run/renderd/renderd.sock
-
- # Alternatively you can use a TCP socket to connect to renderd. The first part
- # is the location of the renderd server and the second is the port to connect to.
-diff --git a/munin/renderd_processed b/munin/renderd_processed
-index fa5db69..bacb088 100755
---- a/munin/renderd_processed
-+++ b/munin/renderd_processed
-@@ -49,12 +49,12 @@ if [ "$1" = "config" ]; then
- exit 0
- fi
-
--reqprocessed=`sed -e '/^ReqRendered/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
--reqprioprocessed=`sed -e '/^ReqPrioRendered/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
--reqpriolowprocessed=`sed -e '/^ReqLowRendered/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
--dirtprocessed=`sed -e '/^DirtyRendered/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
--reqbulkprocessed=`sed -e '/^ReqBulkRendered/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
--dropped=`sed -e '/^DropedRequest/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
-+reqprocessed=`sed -e '/^ReqRendered/!d' -e 's/.*: //' -e q /run/renderd/renderd.stats`
-+reqprioprocessed=`sed -e '/^ReqPrioRendered/!d' -e 's/.*: //' -e q /run/renderd/renderd.stats`
-+reqpriolowprocessed=`sed -e '/^ReqLowRendered/!d' -e 's/.*: //' -e q /run/renderd/renderd.stats`
-+dirtprocessed=`sed -e '/^DirtyRendered/!d' -e 's/.*: //' -e q /run/renderd/renderd.stats`
-+reqbulkprocessed=`sed -e '/^ReqBulkRendered/!d' -e 's/.*: //' -e q /run/renderd/renderd.stats`
-+dropped=`sed -e '/^DropedRequest/!d' -e 's/.*: //' -e q /run/renderd/renderd.stats`
-
- echo "req.value " $reqprocessed
- echo "reqLow.value " $reqpriolowprocessed
-diff --git a/munin/renderd_queue b/munin/renderd_queue
-index 78673a7..1a477ed 100755
---- a/munin/renderd_queue
-+++ b/munin/renderd_queue
-@@ -32,11 +32,11 @@ if [ "$1" = "config" ]; then
- exit 0
- fi
-
--reqlength=`sed -e '/^ReqQueueLength/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
--reqpriolength=`sed -e '/^ReqPrioQueueLength/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
--reqpriolowlength=`sed -e '/^ReqLowQueueLength/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
--reqbulklength=`sed -e '/^ReqBulkQueueLength/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
--dirtlength=`sed -e '/^DirtQueueLength/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
-+reqlength=`sed -e '/^ReqQueueLength/!d' -e 's/.*: //' -e q /run/renderd/renderd.stats`
-+reqpriolength=`sed -e '/^ReqPrioQueueLength/!d' -e 's/.*: //' -e q /run/renderd/renderd.stats`
-+reqpriolowlength=`sed -e '/^ReqLowQueueLength/!d' -e 's/.*: //' -e q /run/renderd/renderd.stats`
-+reqbulklength=`sed -e '/^ReqBulkQueueLength/!d' -e 's/.*: //' -e q /run/renderd/renderd.stats`
-+dirtlength=`sed -e '/^DirtQueueLength/!d' -e 's/.*: //' -e q /run/renderd/renderd.stats`
-
- echo "reqPrio.value " $reqpriolength
- echo "req.value " $reqlength
-diff --git a/munin/renderd_queue_time b/munin/renderd_queue_time
-index 0ebee4b..4ef1928 100755
---- a/munin/renderd_queue_time
-+++ b/munin/renderd_queue_time
-@@ -47,11 +47,11 @@ if [ "$1" = "config" ]; then
- exit 0
- fi
-
--reqTime=`sed -e '/^TimeRendered/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
--reqprioTime=`sed -e '/^TimePrioRendered/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
--reqpriolowTime=`sed -e '/^TimeLowRendered/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
--reqbulkTime=`sed -e '/^TimeBulkRendered/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
--dirtyTime=`sed -e '/^TimeDirtyRendered/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
-+reqTime=`sed -e '/^TimeRendered/!d' -e 's/.*: //' -e q /run/renderd/renderd.stats`
-+reqprioTime=`sed -e '/^TimePrioRendered/!d' -e 's/.*: //' -e q /run/renderd/renderd.stats`
-+reqpriolowTime=`sed -e '/^TimeLowRendered/!d' -e 's/.*: //' -e q /run/renderd/renderd.stats`
-+reqbulkTime=`sed -e '/^TimeBulkRendered/!d' -e 's/.*: //' -e q /run/renderd/renderd.stats`
-+dirtyTime=`sed -e '/^TimeDirtyRendered/!d' -e 's/.*: //' -e q /run/renderd/renderd.stats`
-
-
- echo "req.value " $reqTime
-diff --git a/munin/renderd_zoom b/munin/renderd_zoom
-index 906facb..20dad63 100755
---- a/munin/renderd_zoom
-+++ b/munin/renderd_zoom
-@@ -49,27 +49,27 @@ if [ "$1" = "config" ]; then
- exit 0
- fi
-
--req0=`sed -e '/^ZoomRendered00/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
--req1=`sed -e '/^ZoomRendered01/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
--req2=`sed -e '/^ZoomRendered02/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
--req3=`sed -e '/^ZoomRendered03/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
--req4=`sed -e '/^ZoomRendered04/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
--req5=`sed -e '/^ZoomRendered05/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
--req6=`sed -e '/^ZoomRendered06/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
--req7=`sed -e '/^ZoomRendered07/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
--req8=`sed -e '/^ZoomRendered08/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
--req9=`sed -e '/^ZoomRendered09/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
--req10=`sed -e '/^ZoomRendered10/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
--req11=`sed -e '/^ZoomRendered11/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
--req12=`sed -e '/^ZoomRendered12/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
--req13=`sed -e '/^ZoomRendered13/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
--req14=`sed -e '/^ZoomRendered14/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
--req15=`sed -e '/^ZoomRendered15/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
--req16=`sed -e '/^ZoomRendered16/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
--req17=`sed -e '/^ZoomRendered17/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
--req18=`sed -e '/^ZoomRendered18/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
--req19=`sed -e '/^ZoomRendered19/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
--req20=`sed -e '/^ZoomRendered20/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
-+req0=`sed -e '/^ZoomRendered00/!d' -e 's/.*: //' -e q /run/renderd/renderd.stats`
-+req1=`sed -e '/^ZoomRendered01/!d' -e 's/.*: //' -e q /run/renderd/renderd.stats`
-+req2=`sed -e '/^ZoomRendered02/!d' -e 's/.*: //' -e q /run/renderd/renderd.stats`
-+req3=`sed -e '/^ZoomRendered03/!d' -e 's/.*: //' -e q /run/renderd/renderd.stats`
-+req4=`sed -e '/^ZoomRendered04/!d' -e 's/.*: //' -e q /run/renderd/renderd.stats`
-+req5=`sed -e '/^ZoomRendered05/!d' -e 's/.*: //' -e q /run/renderd/renderd.stats`
-+req6=`sed -e '/^ZoomRendered06/!d' -e 's/.*: //' -e q /run/renderd/renderd.stats`
-+req7=`sed -e '/^ZoomRendered07/!d' -e 's/.*: //' -e q /run/renderd/renderd.stats`
-+req8=`sed -e '/^ZoomRendered08/!d' -e 's/.*: //' -e q /run/renderd/renderd.stats`
-+req9=`sed -e '/^ZoomRendered09/!d' -e 's/.*: //' -e q /run/renderd/renderd.stats`
-+req10=`sed -e '/^ZoomRendered10/!d' -e 's/.*: //' -e q /run/renderd/renderd.stats`
-+req11=`sed -e '/^ZoomRendered11/!d' -e 's/.*: //' -e q /run/renderd/renderd.stats`
-+req12=`sed -e '/^ZoomRendered12/!d' -e 's/.*: //' -e q /run/renderd/renderd.stats`
-+req13=`sed -e '/^ZoomRendered13/!d' -e 's/.*: //' -e q /run/renderd/renderd.stats`
-+req14=`sed -e '/^ZoomRendered14/!d' -e 's/.*: //' -e q /run/renderd/renderd.stats`
-+req15=`sed -e '/^ZoomRendered15/!d' -e 's/.*: //' -e q /run/renderd/renderd.stats`
-+req16=`sed -e '/^ZoomRendered16/!d' -e 's/.*: //' -e q /run/renderd/renderd.stats`
-+req17=`sed -e '/^ZoomRendered17/!d' -e 's/.*: //' -e q /run/renderd/renderd.stats`
-+req18=`sed -e '/^ZoomRendered18/!d' -e 's/.*: //' -e q /run/renderd/renderd.stats`
-+req19=`sed -e '/^ZoomRendered19/!d' -e 's/.*: //' -e q /run/renderd/renderd.stats`
-+req20=`sed -e '/^ZoomRendered20/!d' -e 's/.*: //' -e q /run/renderd/renderd.stats`
-
- if [ -z req19 ]; then req19=0; fi
- if [ -z req20 ]; then req20=0; fi
-diff --git a/munin/renderd_zoom_time b/munin/renderd_zoom_time
-index 4f298a5..bddf396 100755
---- a/munin/renderd_zoom_time
-+++ b/munin/renderd_zoom_time
-@@ -56,27 +56,27 @@ if [ "$1" = "config" ]; then
- exit 0
- fi
-
--req0=`sed -e '/^TimeRenderedZoom00/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
--req1=`sed -e '/^TimeRenderedZoom01/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
--req2=`sed -e '/^TimeRenderedZoom02/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
--req3=`sed -e '/^TimeRenderedZoom03/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
--req4=`sed -e '/^TimeRenderedZoom04/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
--req5=`sed -e '/^TimeRenderedZoom05/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
--req6=`sed -e '/^TimeRenderedZoom06/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
--req7=`sed -e '/^TimeRenderedZoom07/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
--req8=`sed -e '/^TimeRenderedZoom08/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
--req9=`sed -e '/^TimeRenderedZoom09/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
--req10=`sed -e '/^TimeRenderedZoom10/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
--req11=`sed -e '/^TimeRenderedZoom11/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
--req12=`sed -e '/^TimeRenderedZoom12/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
--req13=`sed -e '/^TimeRenderedZoom13/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
--req14=`sed -e '/^TimeRenderedZoom14/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
--req15=`sed -e '/^TimeRenderedZoom15/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
--req16=`sed -e '/^TimeRenderedZoom16/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
--req17=`sed -e '/^TimeRenderedZoom17/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
--req18=`sed -e '/^TimeRenderedZoom18/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
--req19=`sed -e '/^TimeRenderedZoom19/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
--req20=`sed -e '/^TimeRenderedZoom20/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
-+req0=`sed -e '/^TimeRenderedZoom00/!d' -e 's/.*: //' -e q /run/renderd/renderd.stats`
-+req1=`sed -e '/^TimeRenderedZoom01/!d' -e 's/.*: //' -e q /run/renderd/renderd.stats`
-+req2=`sed -e '/^TimeRenderedZoom02/!d' -e 's/.*: //' -e q /run/renderd/renderd.stats`
-+req3=`sed -e '/^TimeRenderedZoom03/!d' -e 's/.*: //' -e q /run/renderd/renderd.stats`
-+req4=`sed -e '/^TimeRenderedZoom04/!d' -e 's/.*: //' -e q /run/renderd/renderd.stats`
-+req5=`sed -e '/^TimeRenderedZoom05/!d' -e 's/.*: //' -e q /run/renderd/renderd.stats`
-+req6=`sed -e '/^TimeRenderedZoom06/!d' -e 's/.*: //' -e q /run/renderd/renderd.stats`
-+req7=`sed -e '/^TimeRenderedZoom07/!d' -e 's/.*: //' -e q /run/renderd/renderd.stats`
-+req8=`sed -e '/^TimeRenderedZoom08/!d' -e 's/.*: //' -e q /run/renderd/renderd.stats`
-+req9=`sed -e '/^TimeRenderedZoom09/!d' -e 's/.*: //' -e q /run/renderd/renderd.stats`
-+req10=`sed -e '/^TimeRenderedZoom10/!d' -e 's/.*: //' -e q /run/renderd/renderd.stats`
-+req11=`sed -e '/^TimeRenderedZoom11/!d' -e 's/.*: //' -e q /run/renderd/renderd.stats`
-+req12=`sed -e '/^TimeRenderedZoom12/!d' -e 's/.*: //' -e q /run/renderd/renderd.stats`
-+req13=`sed -e '/^TimeRenderedZoom13/!d' -e 's/.*: //' -e q /run/renderd/renderd.stats`
-+req14=`sed -e '/^TimeRenderedZoom14/!d' -e 's/.*: //' -e q /run/renderd/renderd.stats`
-+req15=`sed -e '/^TimeRenderedZoom15/!d' -e 's/.*: //' -e q /run/renderd/renderd.stats`
-+req16=`sed -e '/^TimeRenderedZoom16/!d' -e 's/.*: //' -e q /run/renderd/renderd.stats`
-+req17=`sed -e '/^TimeRenderedZoom17/!d' -e 's/.*: //' -e q /run/renderd/renderd.stats`
-+req18=`sed -e '/^TimeRenderedZoom18/!d' -e 's/.*: //' -e q /run/renderd/renderd.stats`
-+req19=`sed -e '/^TimeRenderedZoom19/!d' -e 's/.*: //' -e q /run/renderd/renderd.stats`
-+req20=`sed -e '/^TimeRenderedZoom20/!d' -e 's/.*: //' -e q /run/renderd/renderd.stats`
-
- if [ -z "$req19" ]; then req19=0; fi
- if [ -z "$req20" ]; then req20=0; fi
-diff --git a/openstreetmap-tiles-update-expire b/openstreetmap-tiles-update-expire
-index cdaa04b..03075d7 100755
---- a/openstreetmap-tiles-update-expire
-+++ b/openstreetmap-tiles-update-expire
-@@ -111,7 +111,7 @@ else
- freelock "$LOCK_FILE"
-
- m_ok "expiring tiles"
-- if ! render_expired --min-zoom=$EXPIRY_MINZOOM --max-zoom=$EXPIRY_MAXZOOM --touch-from=$EXPIRY_MINZOOM -s /var/run/renderd.sock < "$EXPIRY_FILE.$$" 2>&1 | tail -8 >> "$EXPIRYLOG"; then
-+ if ! render_expired --min-zoom=$EXPIRY_MINZOOM --max-zoom=$EXPIRY_MAXZOOM --touch-from=$EXPIRY_MINZOOM -s /run/renderd.sock < "$EXPIRY_FILE.$$" 2>&1 | tail -8 >> "$EXPIRYLOG"; then
- m_info "Expiry failed"
- fi
-
-diff --git a/renderd.conf b/renderd.conf
-index b8c5fa8..9310b25 100644
---- a/renderd.conf
-+++ b/renderd.conf
-@@ -1,22 +1,22 @@
- [renderd]
--;socketname=/var/run/renderd/renderd.sock
-+;socketname=/run/renderd/renderd.sock
- num_threads=4
- tile_dir=/var/lib/mod_tile
--stats_file=/var/run/renderd/renderd.stats
-+stats_file=/run/renderd/renderd.stats
-
- ;[renderd01]
- ;iphostname=::1
- ;ipport=7654
- ;num_threads=4
- ;tile_dir=rados://tiles/etc/ceph/ceph.conf
--;stats_file=/var/run/renderd/renderd.stats
-+;stats_file=/run/renderd/renderd.stats
-
- ;[renderd02]
- ;iphostname=::1
- ;ipport=7654
- ;num_threads=8
- ;tile_dir=memcached://
--;stats_file=/var/run/renderd/renderd.stats
-+;stats_file=/run/renderd/renderd.stats
-
- [mapnik]
- plugins_dir=/usr/lib/mapnik/input
-diff --git a/src/daemon.c b/src/daemon.c
-index e406500..e68a05d 100644
---- a/src/daemon.c
-+++ b/src/daemon.c
-@@ -26,7 +26,7 @@
- #include "protocol_helper.h"
- #include "request_queue.h"
-
--#define PIDFILE "/var/run/renderd/renderd.pid"
-+#define PIDFILE "/run/renderd/renderd.pid"
-
- #if SYSTEM_LIBINIPARSER
- #include <iniparser/iniparser.h>
=====================================
debian/patches/iniparser.patch
=====================================
@@ -22,11 +22,11 @@ index c6ff10a..328f114 100644
AM_CONDITIONAL([SYSTEM_LIBINIPARSER], [test "x$have_system_iniparser" = "xyes"])
if test "x$have_system_iniparser" = "xyes"; then
diff --git a/src/daemon.c b/src/daemon.c
-index 56a5b0b..8e10103 100644
+index 964f5bb..e68a05d 100644
--- a/src/daemon.c
+++ b/src/daemon.c
@@ -29,7 +29,7 @@
- #define PIDFILE "/var/run/renderd/renderd.pid"
+ #define PIDFILE "/run/renderd/renderd.pid"
#if SYSTEM_LIBINIPARSER
-#include <iniparser.h>
=====================================
debian/patches/manpage-section-mismatch.patch deleted
=====================================
@@ -1,130 +0,0 @@
-From: Bas Couwenberg <sebastic at debian.org>
-Date: Tue, 25 Aug 2020 15:47:52 +0000
-Subject: Fix manpage section for renderd.
-Forwarded: https://github.com/openstreetmap/mod_tile/pull/211
-
----
- Makefile.am | 2 +-
- docs/renderd.1 | 46 ++++++++++++++++++++++++++++++++++++++++++++++
- docs/renderd.8 | 46 ----------------------------------------------
- 3 files changed, 47 insertions(+), 47 deletions(-)
- create mode 100644 docs/renderd.1
- delete mode 100644 docs/renderd.8
-
-diff --git a/Makefile.am b/Makefile.am
-index 7fe98fa..bff4988 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -13,7 +13,7 @@ STORE_CPPFLAGS =
-
- bin_PROGRAMS = renderd render_expired render_list render_speedtest render_old
- noinst_PROGRAMS = gen_tile_test
--man_MANS = docs/renderd.8 docs/render_expired.1 docs/render_list.1 docs/render_old.1 docs/render_speedtest.1
-+man_MANS = docs/renderd.1 docs/render_expired.1 docs/render_list.1 docs/render_old.1 docs/render_speedtest.1
-
- renderddir = $(sysconfdir)
- renderd_SOURCES = src/daemon.c src/daemon_compat.c src/gen_tile.cpp src/sys_utils.c src/request_queue.c src/cache_expire.c src/metatile.cpp src/parameterize_style.cpp src/protocol_helper.c $(STORE_SOURCES)
-diff --git a/docs/renderd.1 b/docs/renderd.1
-new file mode 100644
-index 0000000..60104f2
---- /dev/null
-+++ b/docs/renderd.1
-@@ -0,0 +1,46 @@
-+.TH RENDERD 1 "Jan 25, 2012"
-+.\" Please adjust this date whenever revising the manpage.
-+.SH NAME
-+renderd \- Rendering daemon for rendering OpenStreetMap tiles.
-+.SH SYNOPSIS
-+.B renderd
-+.RI [ options ]
-+.br
-+.SH DESCRIPTION
-+This manual page documents briefly the
-+.B renderd
-+command.
-+.PP
-+.B renderd
-+is a rendering daemon for map tiles with the mapnik library. It receives render requests
-+on a socket. Renderd queues requests in a number of different queues to manage load while
-+rendering the requests with the mapnik library. By default renderd will start as a daemon.
-+It will log information in the syslog.
-+.PP
-+.SH OPTIONS
-+This programs follow the usual GNU command line syntax, with long
-+options starting with two dashes (`-').
-+A summary of options is included below.
-+.TP
-+\fB\-f\fR|\-\-foreground
-+Run renderd in the foreground for debugging purposes.
-+.TP
-+\fB\-c\fR|\-\-config
-+Set the location of the config file used to configure the various parameters of renderd,
-+like the mapnik style sheet. The default is /etc/renderd.conf
-+.TP
-+\fB\-s\fR|\-\-slave
-+Renderd can be used in a distributed fashion across multiple rendering servers. The master renderd handles queuing and
-+passes requests to the slaves. This parameter specifies which of the slave sections of renderd.conf applies to this instance
-+of renderd. The default is to use the master section
-+.TP
-+\fB\-h\fR|\-\-help
-+Print out a help text for renderd
-+.PP
-+.SH SEE ALSO
-+.BR renderd.conf (1),
-+.br
-+.SH AUTHOR
-+renderd was written by Jon Burgess, and other OpenStreetMap project members.
-+.PP
-+This manual page was written by OpenStreetMap authors.
-diff --git a/docs/renderd.8 b/docs/renderd.8
-deleted file mode 100644
-index 60104f2..0000000
---- a/docs/renderd.8
-+++ /dev/null
-@@ -1,46 +0,0 @@
--.TH RENDERD 1 "Jan 25, 2012"
--.\" Please adjust this date whenever revising the manpage.
--.SH NAME
--renderd \- Rendering daemon for rendering OpenStreetMap tiles.
--.SH SYNOPSIS
--.B renderd
--.RI [ options ]
--.br
--.SH DESCRIPTION
--This manual page documents briefly the
--.B renderd
--command.
--.PP
--.B renderd
--is a rendering daemon for map tiles with the mapnik library. It receives render requests
--on a socket. Renderd queues requests in a number of different queues to manage load while
--rendering the requests with the mapnik library. By default renderd will start as a daemon.
--It will log information in the syslog.
--.PP
--.SH OPTIONS
--This programs follow the usual GNU command line syntax, with long
--options starting with two dashes (`-').
--A summary of options is included below.
--.TP
--\fB\-f\fR|\-\-foreground
--Run renderd in the foreground for debugging purposes.
--.TP
--\fB\-c\fR|\-\-config
--Set the location of the config file used to configure the various parameters of renderd,
--like the mapnik style sheet. The default is /etc/renderd.conf
--.TP
--\fB\-s\fR|\-\-slave
--Renderd can be used in a distributed fashion across multiple rendering servers. The master renderd handles queuing and
--passes requests to the slaves. This parameter specifies which of the slave sections of renderd.conf applies to this instance
--of renderd. The default is to use the master section
--.TP
--\fB\-h\fR|\-\-help
--Print out a help text for renderd
--.PP
--.SH SEE ALSO
--.BR renderd.conf (1),
--.br
--.SH AUTHOR
--renderd was written by Jon Burgess, and other OpenStreetMap project members.
--.PP
--This manual page was written by OpenStreetMap authors.
=====================================
debian/patches/series
=====================================
@@ -1,7 +1,3 @@
iniparser.patch
-spelling-errors.patch
-manpage-section-mismatch.patch
-0004-Move-variables-to-prevent-duplicates.patch
-0005-replicate-seqences-tool-has-long-been-moved.patch
-0006-Change-to-fetch-minutely-updates-from-https-not-http.patch
-0007-Adhere-to-FHS-3.0-and-use-daemon-under-run.patch
+0002-replicate-seqences-tool-has-long-been-moved.patch
+0003-Change-to-fetch-minutely-updates-from-https-not-http.patch
=====================================
debian/patches/spelling-errors.patch deleted
=====================================
@@ -1,68 +0,0 @@
-From: Bas Couwenberg <sebastic at debian.org>
-Date: Tue, 25 Aug 2020 15:47:52 +0000
-Subject: Fix spelling errors.
-Forwarded: https://github.com/openstreetmap/mod_tile/pull/212
-
-* recieve -> receive
-* accross -> across
-* determins -> determines
-* reqyest -> request
----
- docs/renderd.8 | 2 +-
- src/daemon.c | 2 +-
- src/mod_tile.c | 2 +-
- src/protocol_helper.c | 2 +-
- 4 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/docs/renderd.8 b/docs/renderd.8
-index 6b9a756..60104f2 100644
---- a/docs/renderd.8
-+++ b/docs/renderd.8
-@@ -30,7 +30,7 @@ Set the location of the config file used to configure the various parameters of
- like the mapnik style sheet. The default is /etc/renderd.conf
- .TP
- \fB\-s\fR|\-\-slave
--Renderd can be used in a distributed fashion accross multiple rendering servers. The master renderd handles queuing and
-+Renderd can be used in a distributed fashion across multiple rendering servers. The master renderd handles queuing and
- passes requests to the slaves. This parameter specifies which of the slave sections of renderd.conf applies to this instance
- of renderd. The default is to use the master section
- .TP
-diff --git a/src/daemon.c b/src/daemon.c
-index 8e10103..d370463 100644
---- a/src/daemon.c
-+++ b/src/daemon.c
-@@ -687,7 +687,7 @@ int main(int argc, char **argv)
- syslog(LOG_ERR, "Failed to initialise request queue");
- exit(1);
- }
-- syslog(LOG_ERR, "Initiating reqyest_queue");
-+ syslog(LOG_ERR, "Initiating request_queue");
-
- xmlconfigitem maps[XMLCONFIGS_MAX];
- bzero(maps, sizeof(xmlconfigitem) * XMLCONFIGS_MAX);
-diff --git a/src/mod_tile.c b/src/mod_tile.c
-index 010fc69..123315d 100644
---- a/src/mod_tile.c
-+++ b/src/mod_tile.c
-@@ -2412,7 +2412,7 @@ static const command_rec tile_cmds[] =
- mod_tile_cache_lastmod_factor_config, /* config action routine */
- NULL, /* argument to include in call */
- OR_OPTIONS, /* where available */
-- "Set the factor by which the last modified determins cache expiry" /* directive description */
-+ "Set the factor by which the last modified determines cache expiry" /* directive description */
- ),
- AP_INIT_TAKE2(
- "ModTileCacheDurationLowZoom", /* directive name */
-diff --git a/src/protocol_helper.c b/src/protocol_helper.c
-index e7a80d6..324b20c 100644
---- a/src/protocol_helper.c
-+++ b/src/protocol_helper.c
-@@ -42,7 +42,7 @@ int recv_cmd(struct protocol * cmd, int fd, int block) {
- return 0;
- }
- if ((cmd->ver > 3) || (cmd->ver < 1)) {
-- syslog(LOG_WARNING, "WARNING: Failed to recieve render cmd with unknown protocol version %i\n", cmd->ver);
-+ syslog(LOG_WARNING, "WARNING: Failed to receive render cmd with unknown protocol version %i\n", cmd->ver);
- return -1;
- }
- syslog(LOG_DEBUG, "DEBUG: Got incoming request with protocol version %i\n", cmd->ver);
=====================================
docs/renderd.8 → docs/renderd.1
=====================================
@@ -30,7 +30,7 @@ Set the location of the config file used to configure the various parameters of
like the mapnik style sheet. The default is /etc/renderd.conf
.TP
\fB\-s\fR|\-\-slave
-Renderd can be used in a distributed fashion accross multiple rendering servers. The master renderd handles queuing and
+Renderd can be used in a distributed fashion across multiple rendering servers. The master renderd handles queuing and
passes requests to the slaves. This parameter specifies which of the slave sections of renderd.conf applies to this instance
of renderd. The default is to use the master section
.TP
=====================================
includes/daemon.h
=====================================
@@ -45,7 +45,7 @@ typedef struct {
-struct request_queue * render_request_queue;
+extern struct request_queue * render_request_queue;
void statsRenderFinish(int z, long time);
void request_exit(void);
=====================================
includes/protocol.h
=====================================
@@ -17,7 +17,7 @@ extern "C" {
*/
#define TILE_PATH_MAX (256)
#define PROTO_VER (3)
-#define RENDER_SOCKET "/var/run/renderd/renderd.sock"
+#define RENDER_SOCKET "/run/renderd/renderd.sock"
#define XMLCONFIG_MAX 41
enum protoCmd { cmdIgnore, cmdRender, cmdDirty, cmdDone, cmdNotDone, cmdRenderPrio, cmdRenderBulk, cmdRenderLow };
=====================================
includes/render_submit_queue.h
=====================================
@@ -5,8 +5,6 @@ extern "C" {
#endif
-int work_complete;
-
void enqueue(const char *xmlname, int x, int y, int z);
void spawn_workers(int num, const char *socketpath, int maxLoad);
void wait_for_empty_queue(void);
=====================================
mod_tile.conf
=====================================
@@ -53,7 +53,7 @@ LoadModule tile_module modules/mod_tile.so
ModTileVeryOldThreshold 31536000000000
# Unix domain socket where we connect to the rendering daemon
- ModTileRenderdSocketName /var/run/renderd/renderd.sock
+ ModTileRenderdSocketName /run/renderd/renderd.sock
# Alternatively you can use a TCP socket to connect to renderd. The first part
# is the location of the renderd server and the second is the port to connect to.
=====================================
munin/renderd_processed
=====================================
@@ -49,12 +49,12 @@ if [ "$1" = "config" ]; then
exit 0
fi
-reqprocessed=`sed -e '/^ReqRendered/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
-reqprioprocessed=`sed -e '/^ReqPrioRendered/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
-reqpriolowprocessed=`sed -e '/^ReqLowRendered/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
-dirtprocessed=`sed -e '/^DirtyRendered/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
-reqbulkprocessed=`sed -e '/^ReqBulkRendered/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
-dropped=`sed -e '/^DropedRequest/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
+reqprocessed=`sed -e '/^ReqRendered/!d' -e 's/.*: //' -e q /run/renderd/renderd.stats`
+reqprioprocessed=`sed -e '/^ReqPrioRendered/!d' -e 's/.*: //' -e q /run/renderd/renderd.stats`
+reqpriolowprocessed=`sed -e '/^ReqLowRendered/!d' -e 's/.*: //' -e q /run/renderd/renderd.stats`
+dirtprocessed=`sed -e '/^DirtyRendered/!d' -e 's/.*: //' -e q /run/renderd/renderd.stats`
+reqbulkprocessed=`sed -e '/^ReqBulkRendered/!d' -e 's/.*: //' -e q /run/renderd/renderd.stats`
+dropped=`sed -e '/^DropedRequest/!d' -e 's/.*: //' -e q /run/renderd/renderd.stats`
echo "req.value " $reqprocessed
echo "reqLow.value " $reqpriolowprocessed
=====================================
munin/renderd_queue
=====================================
@@ -32,11 +32,11 @@ if [ "$1" = "config" ]; then
exit 0
fi
-reqlength=`sed -e '/^ReqQueueLength/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
-reqpriolength=`sed -e '/^ReqPrioQueueLength/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
-reqpriolowlength=`sed -e '/^ReqLowQueueLength/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
-reqbulklength=`sed -e '/^ReqBulkQueueLength/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
-dirtlength=`sed -e '/^DirtQueueLength/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
+reqlength=`sed -e '/^ReqQueueLength/!d' -e 's/.*: //' -e q /run/renderd/renderd.stats`
+reqpriolength=`sed -e '/^ReqPrioQueueLength/!d' -e 's/.*: //' -e q /run/renderd/renderd.stats`
+reqpriolowlength=`sed -e '/^ReqLowQueueLength/!d' -e 's/.*: //' -e q /run/renderd/renderd.stats`
+reqbulklength=`sed -e '/^ReqBulkQueueLength/!d' -e 's/.*: //' -e q /run/renderd/renderd.stats`
+dirtlength=`sed -e '/^DirtQueueLength/!d' -e 's/.*: //' -e q /run/renderd/renderd.stats`
echo "reqPrio.value " $reqpriolength
echo "req.value " $reqlength
=====================================
munin/renderd_queue_time
=====================================
@@ -47,11 +47,11 @@ if [ "$1" = "config" ]; then
exit 0
fi
-reqTime=`sed -e '/^TimeRendered/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
-reqprioTime=`sed -e '/^TimePrioRendered/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
-reqpriolowTime=`sed -e '/^TimeLowRendered/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
-reqbulkTime=`sed -e '/^TimeBulkRendered/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
-dirtyTime=`sed -e '/^TimeDirtyRendered/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
+reqTime=`sed -e '/^TimeRendered/!d' -e 's/.*: //' -e q /run/renderd/renderd.stats`
+reqprioTime=`sed -e '/^TimePrioRendered/!d' -e 's/.*: //' -e q /run/renderd/renderd.stats`
+reqpriolowTime=`sed -e '/^TimeLowRendered/!d' -e 's/.*: //' -e q /run/renderd/renderd.stats`
+reqbulkTime=`sed -e '/^TimeBulkRendered/!d' -e 's/.*: //' -e q /run/renderd/renderd.stats`
+dirtyTime=`sed -e '/^TimeDirtyRendered/!d' -e 's/.*: //' -e q /run/renderd/renderd.stats`
echo "req.value " $reqTime
=====================================
munin/renderd_zoom
=====================================
@@ -49,27 +49,27 @@ if [ "$1" = "config" ]; then
exit 0
fi
-req0=`sed -e '/^ZoomRendered00/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
-req1=`sed -e '/^ZoomRendered01/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
-req2=`sed -e '/^ZoomRendered02/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
-req3=`sed -e '/^ZoomRendered03/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
-req4=`sed -e '/^ZoomRendered04/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
-req5=`sed -e '/^ZoomRendered05/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
-req6=`sed -e '/^ZoomRendered06/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
-req7=`sed -e '/^ZoomRendered07/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
-req8=`sed -e '/^ZoomRendered08/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
-req9=`sed -e '/^ZoomRendered09/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
-req10=`sed -e '/^ZoomRendered10/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
-req11=`sed -e '/^ZoomRendered11/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
-req12=`sed -e '/^ZoomRendered12/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
-req13=`sed -e '/^ZoomRendered13/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
-req14=`sed -e '/^ZoomRendered14/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
-req15=`sed -e '/^ZoomRendered15/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
-req16=`sed -e '/^ZoomRendered16/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
-req17=`sed -e '/^ZoomRendered17/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
-req18=`sed -e '/^ZoomRendered18/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
-req19=`sed -e '/^ZoomRendered19/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
-req20=`sed -e '/^ZoomRendered20/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
+req0=`sed -e '/^ZoomRendered00/!d' -e 's/.*: //' -e q /run/renderd/renderd.stats`
+req1=`sed -e '/^ZoomRendered01/!d' -e 's/.*: //' -e q /run/renderd/renderd.stats`
+req2=`sed -e '/^ZoomRendered02/!d' -e 's/.*: //' -e q /run/renderd/renderd.stats`
+req3=`sed -e '/^ZoomRendered03/!d' -e 's/.*: //' -e q /run/renderd/renderd.stats`
+req4=`sed -e '/^ZoomRendered04/!d' -e 's/.*: //' -e q /run/renderd/renderd.stats`
+req5=`sed -e '/^ZoomRendered05/!d' -e 's/.*: //' -e q /run/renderd/renderd.stats`
+req6=`sed -e '/^ZoomRendered06/!d' -e 's/.*: //' -e q /run/renderd/renderd.stats`
+req7=`sed -e '/^ZoomRendered07/!d' -e 's/.*: //' -e q /run/renderd/renderd.stats`
+req8=`sed -e '/^ZoomRendered08/!d' -e 's/.*: //' -e q /run/renderd/renderd.stats`
+req9=`sed -e '/^ZoomRendered09/!d' -e 's/.*: //' -e q /run/renderd/renderd.stats`
+req10=`sed -e '/^ZoomRendered10/!d' -e 's/.*: //' -e q /run/renderd/renderd.stats`
+req11=`sed -e '/^ZoomRendered11/!d' -e 's/.*: //' -e q /run/renderd/renderd.stats`
+req12=`sed -e '/^ZoomRendered12/!d' -e 's/.*: //' -e q /run/renderd/renderd.stats`
+req13=`sed -e '/^ZoomRendered13/!d' -e 's/.*: //' -e q /run/renderd/renderd.stats`
+req14=`sed -e '/^ZoomRendered14/!d' -e 's/.*: //' -e q /run/renderd/renderd.stats`
+req15=`sed -e '/^ZoomRendered15/!d' -e 's/.*: //' -e q /run/renderd/renderd.stats`
+req16=`sed -e '/^ZoomRendered16/!d' -e 's/.*: //' -e q /run/renderd/renderd.stats`
+req17=`sed -e '/^ZoomRendered17/!d' -e 's/.*: //' -e q /run/renderd/renderd.stats`
+req18=`sed -e '/^ZoomRendered18/!d' -e 's/.*: //' -e q /run/renderd/renderd.stats`
+req19=`sed -e '/^ZoomRendered19/!d' -e 's/.*: //' -e q /run/renderd/renderd.stats`
+req20=`sed -e '/^ZoomRendered20/!d' -e 's/.*: //' -e q /run/renderd/renderd.stats`
if [ -z req19 ]; then req19=0; fi
if [ -z req20 ]; then req20=0; fi
=====================================
munin/renderd_zoom_time
=====================================
@@ -56,27 +56,27 @@ if [ "$1" = "config" ]; then
exit 0
fi
-req0=`sed -e '/^TimeRenderedZoom00/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
-req1=`sed -e '/^TimeRenderedZoom01/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
-req2=`sed -e '/^TimeRenderedZoom02/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
-req3=`sed -e '/^TimeRenderedZoom03/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
-req4=`sed -e '/^TimeRenderedZoom04/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
-req5=`sed -e '/^TimeRenderedZoom05/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
-req6=`sed -e '/^TimeRenderedZoom06/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
-req7=`sed -e '/^TimeRenderedZoom07/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
-req8=`sed -e '/^TimeRenderedZoom08/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
-req9=`sed -e '/^TimeRenderedZoom09/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
-req10=`sed -e '/^TimeRenderedZoom10/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
-req11=`sed -e '/^TimeRenderedZoom11/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
-req12=`sed -e '/^TimeRenderedZoom12/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
-req13=`sed -e '/^TimeRenderedZoom13/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
-req14=`sed -e '/^TimeRenderedZoom14/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
-req15=`sed -e '/^TimeRenderedZoom15/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
-req16=`sed -e '/^TimeRenderedZoom16/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
-req17=`sed -e '/^TimeRenderedZoom17/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
-req18=`sed -e '/^TimeRenderedZoom18/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
-req19=`sed -e '/^TimeRenderedZoom19/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
-req20=`sed -e '/^TimeRenderedZoom20/!d' -e 's/.*: //' -e q /var/run/renderd/renderd.stats`
+req0=`sed -e '/^TimeRenderedZoom00/!d' -e 's/.*: //' -e q /run/renderd/renderd.stats`
+req1=`sed -e '/^TimeRenderedZoom01/!d' -e 's/.*: //' -e q /run/renderd/renderd.stats`
+req2=`sed -e '/^TimeRenderedZoom02/!d' -e 's/.*: //' -e q /run/renderd/renderd.stats`
+req3=`sed -e '/^TimeRenderedZoom03/!d' -e 's/.*: //' -e q /run/renderd/renderd.stats`
+req4=`sed -e '/^TimeRenderedZoom04/!d' -e 's/.*: //' -e q /run/renderd/renderd.stats`
+req5=`sed -e '/^TimeRenderedZoom05/!d' -e 's/.*: //' -e q /run/renderd/renderd.stats`
+req6=`sed -e '/^TimeRenderedZoom06/!d' -e 's/.*: //' -e q /run/renderd/renderd.stats`
+req7=`sed -e '/^TimeRenderedZoom07/!d' -e 's/.*: //' -e q /run/renderd/renderd.stats`
+req8=`sed -e '/^TimeRenderedZoom08/!d' -e 's/.*: //' -e q /run/renderd/renderd.stats`
+req9=`sed -e '/^TimeRenderedZoom09/!d' -e 's/.*: //' -e q /run/renderd/renderd.stats`
+req10=`sed -e '/^TimeRenderedZoom10/!d' -e 's/.*: //' -e q /run/renderd/renderd.stats`
+req11=`sed -e '/^TimeRenderedZoom11/!d' -e 's/.*: //' -e q /run/renderd/renderd.stats`
+req12=`sed -e '/^TimeRenderedZoom12/!d' -e 's/.*: //' -e q /run/renderd/renderd.stats`
+req13=`sed -e '/^TimeRenderedZoom13/!d' -e 's/.*: //' -e q /run/renderd/renderd.stats`
+req14=`sed -e '/^TimeRenderedZoom14/!d' -e 's/.*: //' -e q /run/renderd/renderd.stats`
+req15=`sed -e '/^TimeRenderedZoom15/!d' -e 's/.*: //' -e q /run/renderd/renderd.stats`
+req16=`sed -e '/^TimeRenderedZoom16/!d' -e 's/.*: //' -e q /run/renderd/renderd.stats`
+req17=`sed -e '/^TimeRenderedZoom17/!d' -e 's/.*: //' -e q /run/renderd/renderd.stats`
+req18=`sed -e '/^TimeRenderedZoom18/!d' -e 's/.*: //' -e q /run/renderd/renderd.stats`
+req19=`sed -e '/^TimeRenderedZoom19/!d' -e 's/.*: //' -e q /run/renderd/renderd.stats`
+req20=`sed -e '/^TimeRenderedZoom20/!d' -e 's/.*: //' -e q /run/renderd/renderd.stats`
if [ -z "$req19" ]; then req19=0; fi
if [ -z "$req20" ]; then req20=0; fi
=====================================
openstreetmap-tiles-update-expire
=====================================
@@ -109,7 +109,7 @@ else
freelock "$LOCK_FILE"
m_ok "expiring tiles"
- if ! render_expired --min-zoom=$EXPIRY_MINZOOM --max-zoom=$EXPIRY_MAXZOOM --touch-from=$EXPIRY_MINZOOM -s /var/run/renderd.sock < "$EXPIRY_FILE.$$" 2>&1 | tail -8 >> "$EXPIRYLOG"; then
+ if ! render_expired --min-zoom=$EXPIRY_MINZOOM --max-zoom=$EXPIRY_MAXZOOM --touch-from=$EXPIRY_MINZOOM -s /run/renderd.sock < "$EXPIRY_FILE.$$" 2>&1 | tail -8 >> "$EXPIRYLOG"; then
m_info "Expiry failed"
fi
=====================================
renderd.conf
=====================================
@@ -1,22 +1,22 @@
[renderd]
-;socketname=/var/run/renderd/renderd.sock
+;socketname=/run/renderd/renderd.sock
num_threads=4
tile_dir=/var/lib/mod_tile
-stats_file=/var/run/renderd/renderd.stats
+stats_file=/run/renderd/renderd.stats
;[renderd01]
;iphostname=::1
;ipport=7654
;num_threads=4
;tile_dir=rados://tiles/etc/ceph/ceph.conf
-;stats_file=/var/run/renderd/renderd.stats
+;stats_file=/run/renderd/renderd.stats
;[renderd02]
;iphostname=::1
;ipport=7654
;num_threads=8
;tile_dir=memcached://
-;stats_file=/var/run/renderd/renderd.stats
+;stats_file=/run/renderd/renderd.stats
[mapnik]
plugins_dir=/usr/lib/mapnik/input
=====================================
src/daemon.c
=====================================
@@ -26,7 +26,7 @@
#include "protocol_helper.h"
#include "request_queue.h"
-#define PIDFILE "/var/run/renderd/renderd.pid"
+#define PIDFILE "/run/renderd/renderd.pid"
#if SYSTEM_LIBINIPARSER
#include <iniparser.h>
@@ -49,6 +49,7 @@ static renderd_config config;
int noSlaveRenders;
+struct request_queue * render_request_queue;
static const char *cmdStr(enum protoCmd c)
{
@@ -687,7 +688,7 @@ int main(int argc, char **argv)
syslog(LOG_ERR, "Failed to initialise request queue");
exit(1);
}
- syslog(LOG_ERR, "Initiating reqyest_queue");
+ syslog(LOG_ERR, "Initiating request_queue");
xmlconfigitem maps[XMLCONFIGS_MAX];
bzero(maps, sizeof(xmlconfigitem) * XMLCONFIGS_MAX);
=====================================
src/mod_tile.c
=====================================
@@ -2412,7 +2412,7 @@ static const command_rec tile_cmds[] =
mod_tile_cache_lastmod_factor_config, /* config action routine */
NULL, /* argument to include in call */
OR_OPTIONS, /* where available */
- "Set the factor by which the last modified determins cache expiry" /* directive description */
+ "Set the factor by which the last modified determines cache expiry" /* directive description */
),
AP_INIT_TAKE2(
"ModTileCacheDurationLowZoom", /* directive name */
=====================================
src/protocol_helper.c
=====================================
@@ -42,7 +42,7 @@ int recv_cmd(struct protocol * cmd, int fd, int block) {
return 0;
}
if ((cmd->ver > 3) || (cmd->ver < 1)) {
- syslog(LOG_WARNING, "WARNING: Failed to recieve render cmd with unknown protocol version %i\n", cmd->ver);
+ syslog(LOG_WARNING, "WARNING: Failed to receive render cmd with unknown protocol version %i\n", cmd->ver);
return -1;
}
syslog(LOG_DEBUG, "DEBUG: Got incoming request with protocol version %i\n", cmd->ver);
=====================================
src/render_expired.c
=====================================
@@ -89,7 +89,6 @@ unsigned long long twopow[MAX_ZOOM];
static int minZoom = 0;
static int maxZoom = 18;
static int verbose = 0;
-int work_complete;
static int maxLoad = MAX_LOAD_OLD;
void display_rate(struct timeval start, struct timeval end, int num)
=====================================
src/render_list.c
=====================================
@@ -40,7 +40,6 @@ static int maxZoom = MAX_ZOOM;
static int verbose = 0;
static int maxLoad = MAX_LOAD_OLD;
-int work_complete;
void display_rate(struct timeval start, struct timeval end, int num)
{
=====================================
src/render_old.c
=====================================
@@ -47,7 +47,6 @@ static time_t planetTime;
static struct timeval start, end;
-int work_complete;
void display_rate(struct timeval start, struct timeval end, int num)
{
=====================================
src/render_submit_queue.c
=====================================
@@ -47,6 +47,7 @@ static struct qItem *qHead, *qTail;
static int no_workers;
static pthread_t *workers;
+static int work_complete;
static void check_load(void)
{
View it on GitLab: https://salsa.debian.org/debian-gis-team/libapache2-mod-tile/-/compare/ab076f33092f5108462d2e7bc26e096b93106c0b...f782287f8fbc30f60c2c4373c360a4f31fdae21b
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/libapache2-mod-tile/-/compare/ab076f33092f5108462d2e7bc26e096b93106c0b...f782287f8fbc30f60c2c4373c360a4f31fdae21b
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20200924/c38d35c7/attachment-0001.html>
More information about the Pkg-grass-devel
mailing list