vitalif
/
imposm3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

flush tile list at most every 30 seconds

master
Oliver Tonnhofer 2016-11-28 12:11:15 +01:00
parent 5b132abfb1
commit 4ac7509e7d
1 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
diff/run.go
View File

@ -59,21 +59,28 @@ func Run() {
sigc := make(chan os.Signal, 1)
signal.Notify(sigc, syscall.SIGTERM, syscall.SIGINT, syscall.SIGHUP)
var tilelist *expire.TileList
var lastTlFlush = time.Now()
var tileExpireor expire.Expireor
if config.BaseOptions.ExpireTilesDir != "" {
tilelist = expire.NewTileList(config.BaseOptions.ExpireTilesZoom, config.BaseOptions.ExpireTilesDir)
tileExpireor = tilelist
}
shutdown := func() {
logger.Print("Exiting. (SIGTERM/SIGINT/SIGHUB)")
logging.Shutdown()
osmCache.Close()
diffCache.Close()
if tilelist != nil {
err := tilelist.Flush()
if err != nil {
logger.Print("error writing tile expire list", err)
}
}
os.Exit(0)
}
var tiles *expire.TileList
var tileExpireor expire.Expireor
if config.BaseOptions.ExpireTilesDir != "" {
tiles = expire.NewTileList(config.BaseOptions.ExpireTilesZoom, config.BaseOptions.ExpireTilesDir)
tileExpireor = tiles
}
exp := newExpBackoff(2*time.Second, 5*time.Minute)
for {
@ -91,8 +98,11 @@ func Run() {
osmCache.Coords.Flush()
diffCache.Flush()
if err == nil && tiles != nil {
err := tiles.Flush()
if err == nil && tilelist != nil && time.Since(lastTlFlush) > time.Second*30 {
// call at most once every 30 seconds to reduce files during the
// catch-up phase after the initial import
lastTlFlush = time.Now()
err := tilelist.Flush()
if err != nil {
logger.Print("error writing tile expire list", err)
}