forked from mtusi2026/mtusi2026lab3
feat: API replicas over HAProxy (3)
This commit is contained in:
+5
-20
@@ -18,10 +18,7 @@ import (
|
||||
"messenger/internal/service"
|
||||
)
|
||||
|
||||
const (
|
||||
shutdownTimeout = 5 * time.Second
|
||||
migrateAttempts = 60
|
||||
)
|
||||
const shutdownTimeout = 5 * time.Second
|
||||
|
||||
func main() {
|
||||
log := slog.New(slog.NewJSONHandler(os.Stdout, nil))
|
||||
@@ -37,7 +34,8 @@ func run(log *slog.Logger) error {
|
||||
return err
|
||||
}
|
||||
|
||||
if err := migrateWithRetry(log, cfg.DatabaseURL); err != nil {
|
||||
instanceID, err := os.Hostname()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
@@ -63,7 +61,7 @@ func run(log *slog.Logger) error {
|
||||
|
||||
srv := &http.Server{
|
||||
Addr: cfg.Addr(),
|
||||
Handler: router.New(handler.New(users, auth, chats, messages, deps, log)),
|
||||
Handler: router.New(handler.New(users, auth, chats, messages, deps, log), instanceID),
|
||||
ReadHeaderTimeout: 5 * time.Second,
|
||||
ReadTimeout: 15 * time.Second,
|
||||
WriteTimeout: 15 * time.Second,
|
||||
@@ -75,7 +73,7 @@ func run(log *slog.Logger) error {
|
||||
|
||||
errCh := make(chan error, 1)
|
||||
go func() {
|
||||
log.Info("starting server", "addr", srv.Addr, "env", cfg.Env, "session_ttl", cfg.SessionTTL.String())
|
||||
log.Info("starting server", "addr", srv.Addr, "instance_id", instanceID, "env", cfg.Env, "session_ttl", cfg.SessionTTL.String())
|
||||
if err := srv.ListenAndServe(); err != nil && !errors.Is(err, http.ErrServerClosed) {
|
||||
errCh <- err
|
||||
}
|
||||
@@ -96,16 +94,3 @@ func run(log *slog.Logger) error {
|
||||
log.Info("server stopped")
|
||||
return nil
|
||||
}
|
||||
|
||||
func migrateWithRetry(log *slog.Logger, databaseURL string) error {
|
||||
var err error
|
||||
for attempt := 1; attempt <= migrateAttempts; attempt++ {
|
||||
if err = postgres.Migrate(databaseURL); err == nil {
|
||||
log.Info("migrations applied")
|
||||
return nil
|
||||
}
|
||||
log.Warn("migrations failed, retrying", "attempt", attempt, "err", err)
|
||||
time.Sleep(time.Second)
|
||||
}
|
||||
return err
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user