diff --git a/main.go b/main.go index 87dbb07..ad7ef12 100644 --- a/main.go +++ b/main.go @@ -1,16 +1,17 @@ package main import ( + "context" "fmt" - "os" - "runtime" - "time" "mocksnow/db" "mocksnow/internal/settings" utils "mocksnow/internal/utils" "mocksnow/log" "mocksnow/server" "mocksnow/server/router" + "os" + "runtime" + "time" "github.com/go-co-op/gocron/v2" "github.com/joho/godotenv" @@ -38,6 +39,7 @@ func main() { log.GetOutput(), ) + _, cancel := context.WithCancel(context.Background()) //ctx, cancel := context.WithCancel(context.Background()) // Configure database @@ -217,7 +219,7 @@ func main() { svr := server.New( logger, c, - //cancel, + cancel, bindAddress, server.WithRouter(r), server.SetTls(bindDisableTls), diff --git a/server/router/router.go b/server/router/router.go index 2342920..24ebe73 100644 --- a/server/router/router.go +++ b/server/router/router.go @@ -30,6 +30,9 @@ func New(logger *slog.Logger, database db.Database, buildTime string, sha1ver st mux.HandleFunc("/api/now/import/x_dusa2_itom_inc_imp", h.NewSnow) mux.HandleFunc("/api/now/table/incident/", h.GetIncident) + mux.HandleFunc("/api/print", h.RenderIncomingTable) + + // TODO - fallback route that will just echo incoming payload // mux.HandleFunc("/api/event/vm/create", h.VmCreateEvent) // mux.HandleFunc("/api/event/vm/modify", h.VmModifyEvent) diff --git a/server/server.go b/server/server.go index 5eb6340..871d861 100644 --- a/server/server.go +++ b/server/server.go @@ -25,7 +25,7 @@ type Server struct { } // New creates a new server with the given logger, address and options. -func New(logger *slog.Logger, cron gocron.Scheduler, addr string, opts ...Option) *Server { +func New(logger *slog.Logger, cron gocron.Scheduler, cancel context.CancelFunc, addr string, opts ...Option) *Server { // Set some options for TLS tlsConfig := &tls.Config{