[Git][debian-gis-team/libapache2-mod-tile][upstream] New upstream version 0.4+git20200924-8d71103

Felix Delattre gitlab at salsa.debian.org
Thu Sep 24 17:03:05 BST 2020 


Felix Delattre pushed to branch upstream 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

- - - - -


20 changed files:

- Makefile.am
- 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)


=====================================
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/-/commit/ca427e23e5d4f0e391fdcfbaa425c790c8711e1f

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/libapache2-mod-tile/-/commit/ca427e23e5d4f0e391fdcfbaa425c790c8711e1f
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/cc4668d0/attachment-0001.html>

More information about the Pkg-grass-devel mailing list