From fbbd8556017d3d6ec6c0473732a5b1d544cff7f0 Mon Sep 17 00:00:00 2001
From: Thomas Rudin <thomas@rudin.io>
Date: Wed, 20 Feb 2019 21:07:33 +0100
Subject: [PATCH] works with 1 thread
---
server/tiledb/tiledb.go | 7 +------
server/tilerendererjob/common.go | 6 +++---
2 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/server/tiledb/tiledb.go b/server/tiledb/tiledb.go
index 7d6fe50..394f2dc 100644
--- a/server/tiledb/tiledb.go
+++ b/server/tiledb/tiledb.go
@@ -32,12 +32,7 @@ func getKey(pos *coords.TileCoords) []byte {
}
func (this *TileDB) GC() {
- for {
- err := this.db.RunValueLogGC(0.25)
- if err != nil {
- return
- }
- }
+ this.db.RunValueLogGC(0.7)
}
func (this *TileDB) GetTile(pos *coords.TileCoords) ([]byte, error) {
diff --git a/server/tilerendererjob/common.go b/server/tilerendererjob/common.go
index 0d9c495..673175a 100644
--- a/server/tilerendererjob/common.go
+++ b/server/tilerendererjob/common.go
@@ -25,7 +25,7 @@ func renderMapblocks(ctx *app.App, mblist []*mapblockparser.MapBlock) int {
jobs := make(chan *coords.TileCoords, ctx.Config.RenderingQueue)
done := make(chan bool, 1)
- for i := 0; i < ctx.Config.RenderingJobs; i++ {
+ for j := 0; j < ctx.Config.RenderingJobs; j++ {
go worker(ctx, jobs, done)
}
@@ -33,7 +33,7 @@ func renderMapblocks(ctx *app.App, mblist []*mapblockparser.MapBlock) int {
//13
fields := logrus.Fields{
- "pos": mb.Pos,
+ "pos": mb.Pos,
"prefix": "tilerenderjob",
}
logrus.WithFields(fields).Debug("Tile render job mapblock")
@@ -62,7 +62,7 @@ func renderMapblocks(ctx *app.App, mblist []*mapblockparser.MapBlock) int {
"Y": tc.Y,
"Zoom": tc.Zoom,
"LayerId": tc.LayerId,
- "prefix": "tilerenderjob",
+ "prefix": "tilerenderjob",
}
logrus.WithFields(fields).Debug("Tile render job dispatch tile")