From fae0cc5be3cbb2f5e4e47960a6f51b3e09fc586a Mon Sep 17 00:00:00 2001
From: Jemshad Kalathingal <jemshad.ok@gmail.com>
Date: Wed, 25 Jun 2025 12:27:34 +0200
Subject: [PATCH 1/2] capture http server errors

---
 pkg/cmd/server/options.go | 6 ++----
 pkg/server/route/route.go | 7 ++++++-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkg/cmd/server/options.go b/pkg/cmd/server/options.go
index 30c1acc7a..f0e955c2b 100644
--- a/pkg/cmd/server/options.go
+++ b/pkg/cmd/server/options.go
@@ -52,8 +52,6 @@ func (o *ServerOptions) Run() error {
 	if err != nil {
 		return err
 	}
-	if _, err := route.NewCoreRoute(config); err == nil {
-		return nil
-	}
-	return nil
+	_, err = route.NewCoreRoute(config)
+	return err
 }
diff --git a/pkg/server/route/route.go b/pkg/server/route/route.go
index d872c409d..32639b269 100644
--- a/pkg/server/route/route.go
+++ b/pkg/server/route/route.go
@@ -128,8 +128,13 @@ func NewCoreRoute(config *server.Config) (*chi.Mux, error) {
 		})
 	}
 
+	err := http.ListenAndServe(fmt.Sprintf(":%d", config.Port), router)
+	if err != nil {
+		logger.Error(fmt.Sprintf("Error starting server: %s", err))
+		return router, err
+	}
+
 	logger.Info(fmt.Sprintf("Listening on :%d", config.Port))
-	http.ListenAndServe(fmt.Sprintf(":%d", config.Port), router)
 	logger.Info("Server Started...")
 
 	return router, nil

From 60f48c10653b3a2ff4efa4e742356e31422e4cf0 Mon Sep 17 00:00:00 2001
From: Jemshad Kalathingal <1869086+jemshad@users.noreply.github.com>
Date: Tue, 8 Jul 2025 13:08:46 +0200
Subject: [PATCH 2/2] fix: use --timeout instead of deprecated --deadline for
 golangci-lint

---
 Makefile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 572e87ba4..7b507ac98 100644
--- a/Makefile
+++ b/Makefile
@@ -64,11 +64,11 @@ format:  ## Format source code
 
 lint:  ## Lint, will not fix but sets exit code on error
 	@which $(GOLINTER) > /dev/null || (echo "Installing $(GOLINTER)@$(GOLINTER_VERSION) ..."; go install github.com/golangci/golangci-lint/cmd/golangci-lint@$(GOLINTER_VERSION) && echo -e "Installation complete!\n")
-	$(GOLINTER) run --deadline=10m $(SOURCE_PATHS)
+	$(GOLINTER) run --timeout=10m $(SOURCE_PATHS)
 
 lint-fix:  ## Lint, will try to fix errors and modify code
 	@which $(GOLINTER) > /dev/null || (echo "Installing $(GOLINTER)@$(GOLINTER_VERSION) ..."; go install github.com/golangci/golangci-lint/cmd/golangci-lint@$(GOLINTER_VERSION) && echo -e "Installation complete!\n")
-	$(GOLINTER) run --deadline=10m $(SOURCE_PATHS) --fix
+	$(GOLINTER) run --timeout=10m $(SOURCE_PATHS) --fix
 
 doc:  ## Start the documentation server with godoc
 	@which godoc > /dev/null || (echo "Installing godoc@latest ..."; go install golang.org/x/tools/cmd/godoc@latest && echo -e "Installation complete!\n")
@@ -99,7 +99,7 @@ build-local-darwin: show-portal-status $(BUILD_PORTAL) ## Build kusion tool chai
 build-local-darwin-all: build-local-darwin ## Build kusion for macOS
 	# Copy docs
 	cp -r ./docs ./_build/bundles/kusion-darwin/docs
-	
+
 	# README.md
 	cp ./README.md ./_build/bundles/kusion-darwin
 	# Build tgz
@@ -168,7 +168,7 @@ build-local-windows: show-portal-status $(BUILD_PORTAL) ## Build kusion tool cha
 	-rm -rf ./_build/bundles/kusion-windows
 	mkdir -p ./_build/bundles/kusion-windows/bin
 	mkdir -p ./_build/bundles/kusion-windows/kclvm/bin
-	
+
 	# Update version
 	go generate ./pkg/version