Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmd/serve.go
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ func runServer() error {
}

// Создаём веб-сервер
webServer := web.NewServer(db, logger.With("handler_type", "web"))
webServer := web.NewServer(db, logger.With("handler_type", "web"), handler.RefreshZones)
httpServer := &http.Server{
Addr: webAddr,
Handler: webServer,
Expand Down
10 changes: 7 additions & 3 deletions internal/repository/zones.go
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,12 @@ func (s *ZoneStorage) Update(ctx context.Context, name string, ttl, refresh, ret
}

affected, err := res.RowsAffected()
if affected == 0 || err != nil {
return nil, fmt.Errorf("rows not affected: %w", err)
if err != nil {
return nil, fmt.Errorf("affected rows error: %w", err)
}

if affected == 0 {
return nil, fmt.Errorf("rows not affected")
}

return s.Get(ctx, name)
Expand All @@ -119,7 +123,7 @@ func (s *ZoneStorage) Delete(ctx context.Context, name string) (bool, error) {

affected, err := res.RowsAffected()
if err != nil {
return false, err
return false, fmt.Errorf("affected rows error: %w", err)
}
if affected == 0 {
return false, fmt.Errorf("rows not affected")
Expand Down
6 changes: 3 additions & 3 deletions internal/server/handler.go
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,12 @@ func NewHandler(config *HandlerConfig) *Handler {
localZones: make(map[string]struct{}),
logger: config.Logger,
}
h.refreshZones()
h.RefreshZones()
return h
}

// refreshZones загружает список локальных зон из БД в in-memory кэш.
func (h *Handler) refreshZones() {
// RefreshZones загружает список локальных зон из БД в in-memory кэш.
func (h *Handler) RefreshZones() {
zones, err := h.zoneStorage.GetAll(context.Background())
if err != nil {
return
Expand Down
12 changes: 10 additions & 2 deletions internal/web/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,16 @@ type Server struct {
mux *http.ServeMux
tmpl *template.Template
logger *slog.Logger
refreshZones func()
}

func NewServer(db *sql.DB, logger *slog.Logger) *Server {
func NewServer(db *sql.DB, logger *slog.Logger, refeshZones func()) *Server {
s := &Server{
zoneStorage: repository.NewZoneStorage(db),
recordStorage: repository.NewRecordStorage(db),
mux: http.NewServeMux(),
logger: logger,
refreshZones: refeshZones,
}

// Парсим шаблоны из embed.FS
Expand All @@ -53,7 +55,11 @@ func NewServer(db *sql.DB, logger *slog.Logger) *Server {
s.mux.HandleFunc("DELETE /api/records/{id}", s.handleDeleteRecord)

// Static files
staticSub, _ := fs.Sub(staticFS, "static")
staticSub, err := fs.Sub(staticFS, "static")
if err != nil {
panic(err)
}

s.mux.Handle("GET /static/", http.StripPrefix("/static/", http.FileServer(http.FS(staticSub))))

// SPA — все остальные пути отдаём index.html
Expand Down Expand Up @@ -134,6 +140,7 @@ func (s *Server) handleCreateZone(w http.ResponseWriter, r *http.Request) {
writeJSON(w, http.StatusConflict, map[string]string{"error": err.Error()})
return
}
s.refreshZones()
writeJSON(w, http.StatusCreated, zone)
}

Expand Down Expand Up @@ -176,6 +183,7 @@ func (s *Server) handleDeleteZone(w http.ResponseWriter, r *http.Request) {
writeJSON(w, http.StatusInternalServerError, map[string]string{"error": err.Error()})
return
}
s.refreshZones()
w.WriteHeader(http.StatusNoContent)
}

Expand Down
Loading
Loading