consbio/mbtileserver
1
1
Fork 0
mirror of https://github.com/consbio/mbtileserver.git synced 2024-09-11 07:15:24 +03:00
Code Issues Packages Projects Releases Wiki Activity

Remove redundant file walk of tile directory, always setup empty ServiceSets

Browse Source 
Allows server to startup even if no services could be constructed
This commit is contained in:
Brendan C. Ward 2020-02-12 14:16:01 -08:00
parent de40ed94a2
commit ab7ae02578
2 changed files with 13 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
handlers/handlers.go
View File

@ -169,8 +169,12 @@ func (s *ServiceSet) AddDBOnPath(filename string, urlPath string) error {
// NewFromBaseDir returns a ServiceSet that combines all .mbtiles files under
// the directory at baseDir. The DBs will all be served under their relative paths
// to baseDir.
// to baseDir. If baseDir does not exist, is not a valid path, or does not contain
// any valid .mbtiles files, an empty ServiceSet will be returned along with the error.
func NewFromBaseDir(baseDir string, secretKey string) (*ServiceSet, error) {
s := New()
s.secretKey = secretKey
var filenames []string
err := filepath.Walk(baseDir, func(p string, info os.FileInfo, err error) error {
if err != nil {
@ -186,11 +190,12 @@ func NewFromBaseDir(baseDir string, secretKey string) (*ServiceSet, error) {
return nil
})
if err != nil {
return nil, fmt.Errorf("unable to scan tilesets: %v", err)
return s, err
}
s := New()
s.secretKey = secretKey
if len(filenames) == 0 {
return s, fmt.Errorf("no tilesets found in %s", baseDir)
}
for _, filename := range filenames {
subpath, err := filepath.Rel(baseDir, filename)

54
main.go
View File

@ -14,8 +14,6 @@ import (
"net"
"net/http"
"os"
"path/filepath"
"strings"
"time"
"github.com/labstack/echo/v4"
@ -191,35 +189,14 @@ func serve() {
log.Fatalln("Certificate or tls options are required to use redirect")
}
var filenames []string
err := filepath.Walk(tilePath, func(path string, info os.FileInfo, err error) error {
if err != nil {
return err
}
if _, err := os.Stat(path + "-journal"); err == nil {
// Don't try to load .mbtiles files that are being written
return nil
}
if strings.HasSuffix(strings.ToLower(path), ".mbtiles") {
filenames = append(filenames, path)
}
return nil
})
if err != nil {
log.Fatalf("Unable to scan tileset directory for mbtiles files\n%v", err)
}
if len(filenames) == 0 {
log.Warnf("No tilesets found in %s!\n", tilePath)
} else {
log.Infof("Found %v mbtiles files in %s", len(filenames), tilePath)
}
svcSet, err := handlers.NewFromBaseDir(tilePath, secretKey)
if err != nil {
log.Errorf("Unable to create service set: %v", err)
log.Errorf("Unable to create services for mbtiles in '%v': %v\n", tilePath, err)
}
// print number of services
log.Infof("Published %v services", svcSet.Size())
e := echo.New()
e.HideBanner = true
e.Pre(middleware.RemoveTrailingSlash())
@ -433,26 +410,3 @@ func supervise() {
fmt.Println("")
}
}
/*
func notModifiedMiddleware(next echo.HandlerFunc) echo.HandlerFunc {
return func(c echo.Context) error {
var lastModified time.Time
id := c.Param("id")
if _, exists := tilesets[id]; exists {
lastModified = tilesets[id].TimeStamp()
} else {
lastModified = startuptime // startup time of server
}
if t, err := time.Parse(http.TimeFormat, c.Request().Header.Get(echo.HeaderIfModifiedSince)); err == nil && lastModified.Before(t.Add(1*time.Second)) {
c.Response().Header().Del(echo.HeaderContentType)
c.Response().Header().Del(echo.HeaderContentLength)
return c.NoContent(http.StatusNotModified)
}
c.Response().Header().Set(echo.HeaderLastModified, lastModified.UTC().Format(http.TimeFormat))
return next(c)
}
}
*/