From 74a59cff6b2193d55a56a2223f429b2c70674659 Mon Sep 17 00:00:00 2001 From: Yash Mehrotra Date: Tue, 8 Oct 2024 18:44:07 +0530 Subject: [PATCH] chore: do not start server on config-db run (#977) * chore: do not start serve on config-db run <> * chore: use debug port --- cmd/run.go | 57 +++++++++++++++++++++++++++--------------------------- 1 file changed, 29 insertions(+), 28 deletions(-) diff --git a/cmd/run.go b/cmd/run.go index ce622533..1d2b28a3 100644 --- a/cmd/run.go +++ b/cmd/run.go @@ -25,6 +25,7 @@ import ( var outputDir string var filename string +var debugPort int // Run ... var Run = &cobra.Command{ @@ -47,38 +48,37 @@ var Run = &cobra.Command{ dutyCtx = c } - e := echo.New() - - e.Use(func(next echo.HandlerFunc) echo.HandlerFunc { - return func(c echo.Context) error { - c.SetRequest(c.Request().WithContext(dutyCtx.Wrap(c.Request().Context()))) - return next(c) - } - }) - - dutyEcho.AddDebugHandlers(dutyCtx, e, func(next echo.HandlerFunc) echo.HandlerFunc { return next }) - - shutdown.AddHook(func() { - ctx, cancel := gocontext.WithTimeout(gocontext.Background(), 1*time.Minute) - defer cancel() - - if err := e.Shutdown(ctx); err != nil { - e.Logger.Fatal(err) - } - }) - - shutdown.WaitForSignal() - - go func() { - if err := e.Start(fmt.Sprintf(":%d", httpPort)); err != nil && err != http.ErrServerClosed { - e.Logger.Fatal(err) - } - }() - if dutyapi.DefaultConfig.ConnectionString == "" && outputDir == "" { logger.Fatalf("skipping export: neither --output-dir nor --db is specified") } + if debugPort >= 0 { + e := echo.New() + e.Use(func(next echo.HandlerFunc) echo.HandlerFunc { + return func(c echo.Context) error { + c.SetRequest(c.Request().WithContext(dutyCtx.Wrap(c.Request().Context()))) + return next(c) + } + }) + dutyEcho.AddDebugHandlers(dutyCtx, e, func(next echo.HandlerFunc) echo.HandlerFunc { return next }) + + shutdown.AddHook(func() { + ctx, cancel := gocontext.WithTimeout(gocontext.Background(), 1*time.Minute) + defer cancel() + + if err := e.Shutdown(ctx); err != nil { + e.Logger.Fatal(err) + } + }) + shutdown.WaitForSignal() + + go func() { + if err := e.Start(fmt.Sprintf(":%d", debugPort)); err != nil && err != http.ErrServerClosed { + e.Logger.Fatal(err) + } + }() + } + for i := range scraperConfigs { ctx, cancel, cancelTimeout := api.NewScrapeContext(dutyCtx).WithScrapeConfig(&scraperConfigs[i]). WithTimeout(dutyCtx.Properties().Duration("scraper.timeout", 4*time.Hour)) @@ -165,4 +165,5 @@ func exportResource(resource v1.ScrapeResult, filename, outputDir string) error func init() { Run.Flags().StringVarP(&outputDir, "output-dir", "o", "", "The output folder for configurations") Run.Flags().StringVarP(&filename, "filename", "f", ".id", "The filename to save seach resource under") + Run.Flags().IntVar(&debugPort, "debug-port", -1, "Start an HTTP server to use the /debug routes, Use -1 to disable and 0 to pick a free port") }