diff --git a/.gitignore b/.gitignore index e5f2b59..a8273db 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ /config -/letsencrypt \ No newline at end of file +/letsencrypt + +.DS_Store \ No newline at end of file diff --git a/pkg/cmd/server/main.go b/pkg/cmd/server/main.go index d6bd107..812aa01 100644 --- a/pkg/cmd/server/main.go +++ b/pkg/cmd/server/main.go @@ -43,7 +43,7 @@ func main() { log.Warn().Msgf("RoadSign auto generated api credential is %s", credential) } - // Load & init navi + // Load & init navigator if err := navi.ReadInConfig(viper.GetString("paths.configs")); err != nil { log.Panic().Err(err).Msg("An error occurred when loading configurations.") } else { diff --git a/pkg/meta.go b/pkg/meta.go index 0aa016b..7b661f6 100644 --- a/pkg/meta.go +++ b/pkg/meta.go @@ -14,4 +14,4 @@ func init() { } } -var AppVersion = "1.2.1" +var AppVersion = "2.0.0-delta1" diff --git a/pkg/navi/config.go b/pkg/navi/config.go index 277b991..f165901 100644 --- a/pkg/navi/config.go +++ b/pkg/navi/config.go @@ -1,10 +1,12 @@ package navi import ( - "github.com/spf13/viper" "io" "os" "path/filepath" + "strings" + + "github.com/spf13/viper" "github.com/pelletier/go-toml/v2" ) @@ -14,13 +16,15 @@ var R *RoadApp func ReadInConfig(root string) error { instance := &RoadApp{ Regions: make([]*Region, 0), - Traces: make([]RoadTrace, 0, viper.GetInt("performance.traces_limit")), + Traces: make([]RoadTrace, 0, viper.GetInt("performance.traces_limit")), } if err := filepath.Walk(root, func(fp string, info os.FileInfo, _ error) error { var region Region if info.IsDir() { return nil + } else if !strings.HasSuffix(info.Name(), ".toml") { + return nil } else if file, err := os.OpenFile(fp, os.O_RDONLY, 0755); err != nil { return err } else if data, err := io.ReadAll(file); err != nil { @@ -33,7 +37,7 @@ func ReadInConfig(root string) error { if region.Disabled { return nil } - + instance.Regions = append(instance.Regions, ®ion) } diff --git a/pkg/sideload/server.go b/pkg/sideload/server.go index 8ecaca6..4ac50de 100644 --- a/pkg/sideload/server.go +++ b/pkg/sideload/server.go @@ -54,11 +54,11 @@ func InitSideload() *fiber.App { { cgi.Get("/metadata", getMetadata) cgi.Get("/traces", getTraces) - cgi.Get("/statistics", getStatistics) - cgi.Get("/sites", getRegions) - cgi.Get("/sites/cfg/:id", getRegionConfig) - cgi.Get("/processes", getApplications) - cgi.Get("/processes/logs/:id", getApplicationLogs) + cgi.Get("/stats", getStats) + cgi.Get("/regions", getRegions) + cgi.Get("/regions/cfg/:id", getRegionConfig) + cgi.Get("/applications", getApplications) + cgi.Get("/applications/logs/:id", getApplicationLogs) } webhooks := app.Group("/webhooks").Name("WebHooks") diff --git a/pkg/sideload/statistics.go b/pkg/sideload/statistics.go index 2db5d08..6543ae1 100644 --- a/pkg/sideload/statistics.go +++ b/pkg/sideload/statistics.go @@ -7,7 +7,7 @@ import ( "github.com/samber/lo" ) -func getStatistics(c *fiber.Ctx) error { +func getStats(c *fiber.Ctx) error { locations := lo.FlatMap(navi.R.Regions, func(item *navi.Region, idx int) []navi.Location { return item.Locations }) @@ -19,8 +19,8 @@ func getStatistics(c *fiber.Ctx) error { }) return c.JSON(fiber.Map{ - "regions": len(navi.R.Regions), - "locations": len(locations), + "regions": len(navi.R.Regions), + "locations": len(locations), "destinations": len(destinations), "applications": len(applications), })