Skip to content

Commit cb63c6f

Browse files
committed
chore: verbose logging
Signed-off-by: Timur Tuktamyshev <timur.tuktamyshev@flant.com>
1 parent b6e1fd0 commit cb63c6f

File tree

3 files changed

+41
-60
lines changed

3 files changed

+41
-60
lines changed

hooks/pods-hook.sh

Lines changed: 0 additions & 20 deletions
This file was deleted.

pkg/debug/server.go

Lines changed: 34 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,10 @@ import (
55
"fmt"
66
"io"
77
"log/slog"
8+
"net"
89
"net/http"
910
"os"
11+
"path"
1012
"path/filepath"
1113
"strings"
1214

@@ -15,6 +17,7 @@ import (
1517
"github.com/go-chi/chi/v5/middleware"
1618
"gopkg.in/yaml.v3"
1719

20+
utils "github.com/flant/shell-operator/pkg/utils/file"
1821
structuredLogger "github.com/flant/shell-operator/pkg/utils/structured-logger"
1922
)
2023

@@ -44,37 +47,37 @@ func NewServer(prefix, socketPath, httpAddr string, logger *log.Logger) *Server
4447
}
4548

4649
func (s *Server) Init() error {
47-
// address := s.SocketPath
48-
49-
// if err := os.MkdirAll(path.Dir(address), 0o700); err != nil {
50-
// return fmt.Errorf("Debug HTTP server fail to create socket '%s': %w", address, err)
51-
// }
52-
53-
// exists, err := utils.FileExists(address)
54-
// if err != nil {
55-
// return fmt.Errorf("Debug HTTP server fail to check socket '%s': %w", address, err)
56-
// }
57-
58-
// if exists {
59-
// if err := os.Remove(address); err != nil {
60-
// return fmt.Errorf("Debug HTTP server fail to check socket '%s': %w", address, err)
61-
// }
62-
// }
63-
64-
// // Check if socket is available
65-
// listener, err := net.Listen("unix", address)
66-
// if err != nil {
67-
// return fmt.Errorf("Debug HTTP server fail to listen on '%s': %w", address, err)
68-
// }
69-
70-
// s.logger.Info("Debug endpoint listen on address", slog.String("address", address))
71-
72-
// go func() {
73-
// if err := http.Serve(listener, s.Router); err != nil {
74-
// s.logger.Error("Error starting Debug socket server", log.Err(err))
75-
// os.Exit(1)
76-
// }
77-
// }()
50+
address := s.SocketPath
51+
52+
if err := os.MkdirAll(path.Dir(address), 0o700); err != nil {
53+
return fmt.Errorf("Debug HTTP server fail to create socket '%s': %w", address, err)
54+
}
55+
56+
exists, err := utils.FileExists(address)
57+
if err != nil {
58+
return fmt.Errorf("Debug HTTP server fail to check socket '%s': %w", address, err)
59+
}
60+
61+
if exists {
62+
if err := os.Remove(address); err != nil {
63+
return fmt.Errorf("Debug HTTP server fail to check socket '%s': %w", address, err)
64+
}
65+
}
66+
67+
// Check if socket is available
68+
listener, err := net.Listen("unix", address)
69+
if err != nil {
70+
return fmt.Errorf("Debug HTTP server fail to listen on '%s': %w", address, err)
71+
}
72+
73+
s.logger.Info("Debug endpoint listen on address", slog.String("address", address))
74+
75+
go func() {
76+
if err := http.Serve(listener, s.Router); err != nil {
77+
s.logger.Error("Error starting Debug socket server", log.Err(err))
78+
os.Exit(1)
79+
}
80+
}()
7881

7982
if s.HttpAddr != "" {
8083
go func() {

pkg/shell-operator/operator.go

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -960,20 +960,18 @@ func (op *ShellOperator) runMetrics() {
960960

961961
// Shutdown pause kubernetes events handling and stop queues. Wait for queues to stop.
962962
func (op *ShellOperator) Shutdown() {
963-
log.Info("shutdown: begin")
963+
fmt.Println("shutdown begin", slog.String("phase", "shutdown"))
964964
op.ScheduleManager.Stop()
965-
log.Info("shutdown: schedule manager stopped")
965+
fmt.Println("schedule manager stopped", slog.String("phase", "shutdown"))
966966

967967
op.KubeEventsManager.Stop()
968-
log.Info("shutdown: kube events manager canceled, waiting for informers")
969-
if kem, ok := op.KubeEventsManager.(interface{ Wait() }); ok {
970-
kem.Wait()
971-
}
972-
log.Info("shutdown: kube events manager done")
968+
fmt.Println("waiting informers", slog.String("phase", "shutdown"))
969+
op.KubeEventsManager.Wait()
970+
fmt.Println("informers stopped", slog.String("phase", "shutdown"))
973971

974972
op.TaskQueues.Stop()
975-
log.Info("shutdown: task queues stop signaled, waiting")
973+
fmt.Println("waiting task queues", slog.String("phase", "shutdown"))
976974
// Wait for queues to stop, but no more than 10 seconds
977975
op.TaskQueues.WaitStopWithTimeout(WaitQueuesTimeout)
978-
log.Info("shutdown: task queues stopped")
976+
fmt.Println("task queues stopped", slog.String("phase", "shutdown"))
979977
}

0 commit comments

Comments
 (0)