adding cleanup fix update

Author: miledxz

internal/mode/static/manager.go

@@ -63,7 +63,7 @@ const (
 )
 
 var scheme = runtime.NewScheme()
-var proccesHandler = &ngxruntime.ProcessHandlerImpl{}
+var processHandler = &ngxruntime.ProcessHandlerImpl{}
 
 func init() {
 	utilruntime.Must(gatewayv1beta1.Install(scheme))
@@ -135,7 +135,7 @@ func StartManager(cfg config.Config) error {
 	}
 
 	// Ensure NGINX is running before registering metrics & starting the manager.
-	if err := proccesHandler.EnsureNginxRunning(ctx); err != nil {
+	if err := processHandler.EnsureNginxRunning(ctx); err != nil {
 		return fmt.Errorf("NGINX is not running: %w", err)
 	}
 
@@ -212,7 +212,7 @@ func StartManager(cfg config.Config) error {
 			ngxPlusClient,
 			ngxruntimeCollector,
 			cfg.Logger.WithName("nginxRuntimeManager"),
-			proccesHandler,
+			processHandler,
 			ngxruntime.NewVerifyClient(ngxruntime.NginxReloadTimeout),
 		),
 		statusUpdater:                 groupStatusUpdater,

internal/mode/static/nginx/runtime/manager.go

@@ -225,19 +225,9 @@ func (p *ProcessHandlerImpl) FindMainProcess(
 }
 
 func (p *ProcessHandlerImpl) ReadFile(file string) ([]byte, error) {
-	content, err := os.ReadFile(file)
-	if err != nil {
-		return nil, err
-	}
-
-	return content, nil
+	return os.ReadFile(file)
 }
 
 func (p *ProcessHandlerImpl) Kill(pid int, signum syscall.Signal) error {
-	err := syscall.Kill(pid, syscall.SIGHUP)
-	if err != nil {
-		return err
-	}
-
-	return nil
+	return syscall.Kill(pid, syscall.SIGHUP)
 }

internal/mode/static/nginx/runtime/manager_test.go

@@ -28,7 +28,6 @@ var _ = Describe("NGINX Runtime Manager", func() {
 	var (
 		manager         runtime.Manager
 		upstreamServers []ngxclient.UpstreamServer
-		upstreamServer  ngxclient.UpstreamServer
 		ngxPlusClient   *runtimefakes.FakeNginxPlusClient
 		process         *runtimefakes.FakeProcessHandler
 
@@ -37,12 +36,9 @@ var _ = Describe("NGINX Runtime Manager", func() {
 	)
 
 	BeforeEach(func() {
-		upstreamServer = ngxclient.UpstreamServer{}
-
 		upstreamServers = []ngxclient.UpstreamServer{
-			upstreamServer,
+			ngxclient.UpstreamServer{},
 		}
-
 	})
 
 	Context("Reload", func() {
@@ -98,7 +94,6 @@ var _ = Describe("NGINX Runtime Manager", func() {
 		})
 
 		It("sucessfully updates HTTP server upstream", func() {
-
 			Expect(manager.UpdateHTTPServers("test", upstreamServers)).To(Succeed())
 		})
 
@@ -226,7 +221,6 @@ func TestFindMainProcess(t *testing.T) {
 			g := NewWithT(t)
 			p := runtime.ProcessHandlerImpl{}
 			result, err := p.FindMainProcess(test.ctx, test.checkFile, test.readFile, 2*time.Millisecond)
-			//result, err := runtime.FindMainProcess(test.ctx, test.checkFile, test.readFile, 2*time.Millisecond)
 
 			if test.expectError {
 				g.Expect(err).To(HaveOccurred())