Skip to content

Commit

Permalink
Replaced custom template manager with go:embed. Releasing v0.8.0
Browse files Browse the repository at this point in the history
  • Loading branch information
pdt256 committed Mar 26, 2021
1 parent 71b89a8 commit 062698d
Show file tree
Hide file tree
Showing 13 changed files with 22 additions and 458 deletions.
20 changes: 1 addition & 19 deletions cmd/rangedb/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,6 @@ import (
"github.com/inklabs/rangedb/pkg/projection"
"github.com/inklabs/rangedb/pkg/rangedbapi"
"github.com/inklabs/rangedb/pkg/rangedbui"
"github.com/inklabs/rangedb/pkg/rangedbui/pkg/templatemanager"
"github.com/inklabs/rangedb/pkg/rangedbui/pkg/templatemanager/provider/filesystemtemplate"
"github.com/inklabs/rangedb/pkg/rangedbui/pkg/templatemanager/provider/memorytemplate"
"github.com/inklabs/rangedb/pkg/rangedbws"
"github.com/inklabs/rangedb/pkg/shortuuid"
"github.com/inklabs/rangedb/provider/inmemorystore"
Expand All @@ -40,7 +37,6 @@ func main() {
port := flag.Int("port", 8080, "port")
baseURI := flag.String("baseUri", "http://0.0.0.0:8080", "")
dbPath := flag.String("levelDBPath", "", "path to LevelDB directory")
templatesPath := flag.String("templates", "", "optional templates path")
gRPCPort := flag.Int("gRPCPort", 8081, "gRPC port")
flag.Parse()

Expand Down Expand Up @@ -74,21 +70,7 @@ func main() {
log.Fatalf("unable to create RangeDB Server: %v", err)
}

var templateManager templatemanager.TemplateManager
if *templatesPath != "" {
if _, err := os.Stat(*templatesPath); os.IsNotExist(err) {
log.Fatalf("templates path does not exist: %v", err)
}

templateManager = filesystemtemplate.New(*templatesPath)
} else {
templateManager, err = memorytemplate.New(rangedbui.GetTemplates())
if err != nil {
log.Fatalf("unable to load templates: %v", err)
}
}

ui := rangedbui.New(templateManager, api.AggregateTypeStatsProjection(), store)
ui := rangedbui.New(api.AggregateTypeStatsProjection(), store)

muxServer := http.NewServeMux()
muxServer.Handle("/", ui)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package templatemanager
package rangedbui

import (
"encoding/json"
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

0 comments on commit 062698d

Please sign in to comment.