update server app path to host's

resolve server creation issues
add docker specifics
2026-03-19 18:24:19 +01:00 · 2026-03-19 00:25:25 +01:00 · 2026-03-18 19:17:10 +01:00 · 2026-03-18 19:16:49 +01:00 · 2026-03-18 19:15:19 +01:00
36 changed files with 71 additions and 957 deletions
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -13,7 +13,7 @@ services:
      DB_NAME: /data/db/acc.db
      STEAMCMD_LINUX_PATH: /usr/games/steamcmd
      PORT_POOL_MIN: "9600"
-      PORT_POOL_MAX: "9699"
+      PORT_POOL_MAX: "9700"
      ACC_IMAGE: acc-wine:latest
      ACC_SERVERS_PATH: /data/servers
      ACC_SERVERS_HOST_PATH: /opt/acc-servers
--- a/docker/acc-server/Dockerfile
+++ b/docker/acc-server/Dockerfile
@@ -1,5 +1,6 @@
 # ACC Server container: Wine + accServer.exe
-# Game files are bind-mounted from the host at /acc/game.
+# Game files are mounted read-only from the shared acc-game volume.
+# Per-server config files are mounted read-write from the manager's config volume.
 FROM debian:bookworm-slim

 # Install Wine, Xvfb (headless display for Wine), and minimal runtime deps.
@@ -11,17 +12,13 @@ RUN dpkg --add-architecture i386 && \
        wine64 \
        xvfb \
        ca-certificates \
-        tcpdump \
        && \
    rm -rf /var/lib/apt/lists/*

-RUN mkdir -p /tmp/.X11-unix && chmod 1777 /tmp/.X11-unix
+# Create a non-root user for running the server.
+RUN useradd -ms /bin/bash accserver

-WORKDIR /root
-
-ENV WINEARCH=win64
-ENV WINEPREFIX=/root/.wine
-ENV WINEDEBUG=-all
+WORKDIR /home/accserver

 # Copy entrypoint script.
 COPY entrypoint.sh /entrypoint.sh
@@ -30,6 +27,13 @@ RUN chmod +x /entrypoint.sh
 # Bind-mounted by DockerRuntime.Create: per-server game install (rw)
 VOLUME ["/acc/game"]

+# Default server port — overridden at runtime via SERVER_PORT env var.
 ENV SERVER_PORT=9600
+ENV WINEDEBUG=-all
+ENV DISPLAY=:99

+EXPOSE ${SERVER_PORT}/tcp
+EXPOSE ${SERVER_PORT}/udp
+
+USER accserver
 ENTRYPOINT ["/entrypoint.sh"]
--- a/docker/acc-server/entrypoint.sh
+++ b/docker/acc-server/entrypoint.sh
@@ -1,15 +1,7 @@
 #!/bin/bash
 set -e

-# Use a display number derived from the server port to avoid conflicts
-# between containers (each server gets its own unique display).
-DISPLAY_NUM=$((SERVER_PORT % 1000 + 100))
-export DISPLAY=:${DISPLAY_NUM}
-
-# Clean up any stale X lock from a previous container run.
-rm -f /tmp/.X${DISPLAY_NUM}-lock /tmp/.X11-unix/X${DISPLAY_NUM} 2>/dev/null || true
-
-Xvfb ${DISPLAY} -screen 0 1024x768x16 -nolisten tcp &
+Xvfb :99 -screen 0 1024x768x16 &
 XVFB_PID=$!

 cleanup() {
@@ -18,9 +10,7 @@ cleanup() {
 }
 trap cleanup SIGTERM SIGINT

-mkdir -p /acc/game/log
-
 echo "Starting ACC server on port ${SERVER_PORT}..."

-cd /acc/game
-exec wine /acc/game/accServer.exe
+exec wine /acc/game/accServer.exe \
+    -port "${SERVER_PORT}"
--- a/local/api/api.go
+++ b/local/api/api.go
@@ -34,9 +34,6 @@ func Init(di *dig.Container, app *fiber.App) {
 		WebSocket:    groups.Group("/ws"),
 		Leaderboard:  serverIdGroup.Group("/leaderboard"),
 		Steam:        groups.Group("/steam"),
-		ActivityLog:  serverIdGroup.Group("/activity-log"),
-		Groups:       groups,
-		Log:          serverIdGroup.Group("/log"),
 	}

 	accessKeyMiddleware := middleware.NewAccessKeyMiddleware()
--- a/local/controller/activity_log.go
+++ b/local/controller/activity_log.go
@@ -1,48 +0,0 @@
-package controller
-
-import (
-	"acc-server-manager/local/middleware"
-	"acc-server-manager/local/model"
-	"acc-server-manager/local/service"
-	"acc-server-manager/local/utl/common"
-	"acc-server-manager/local/utl/error_handler"
-
-	"github.com/gofiber/fiber/v2"
-)
-
-type ActivityLogController struct {
-	service      *service.ActivityLogService
-	errorHandler *error_handler.ControllerErrorHandler
-}
-
-func NewActivityLogController(as *service.ActivityLogService, routeGroups *common.RouteGroups, auth *middleware.AuthMiddleware) *ActivityLogController {
-	ac := &ActivityLogController{
-		service:      as,
-		errorHandler: error_handler.NewControllerErrorHandler(),
-	}
-
-	// Global activity log: GET /activity-log (admin use)
-	routeGroups.Groups.Group("/activity-log").Use(auth.Authenticate).Get("/", ac.GetAllLogs)
-
-	return ac
-}
-
-// GetAllLogs returns activity logs across all servers (admin).
-//
-//	@Summary		Return all activity logs
-//	@Tags			ActivityLog
-//	@Success		200	{array}	model.ActivityLog
-//	@Router			/activity-log [get]
-func (ac *ActivityLogController) GetAllLogs(c *fiber.Ctx) error {
-	var filter model.ActivityLogFilter
-	if err := common.ParseQueryFilter(c, &filter); err != nil {
-		return ac.errorHandler.HandleValidationError(c, err, "query_filter")
-	}
-
-	result, err := ac.service.GetAll(c.UserContext(), &filter)
-	if err != nil {
-		return ac.errorHandler.HandleServiceError(c, err)
-	}
-
-	return c.JSON(result)
-}
--- a/local/controller/config.go
+++ b/local/controller/config.go
@@ -2,7 +2,6 @@ package controller

 import (
 	"acc-server-manager/local/middleware"
-	"acc-server-manager/local/model"
 	"acc-server-manager/local/service"
 	"acc-server-manager/local/utl/common"
 	"acc-server-manager/local/utl/error_handler"
@@ -35,7 +34,6 @@ func NewConfigController(as *service.ConfigService, routeGroups *common.RouteGro

 	configGroup := routeGroups.Config
 	configGroup.Use(auth.Authenticate)
-	configGroup.Patch("/", ac.UpdateAllConfigs)
 	configGroup.Put("/:file", ac.UpdateConfig)
 	configGroup.Get("/:file", ac.GetConfig)
 	configGroup.Get("/", ac.GetConfigs)
@@ -43,54 +41,6 @@ func NewConfigController(as *service.ConfigService, routeGroups *common.RouteGro
 	return ac
 }

-// updateAllConfigs updates all configuration files
-//
-//	@Summary		Bulk update all server configuration files
-//	@Description	Update multiple ACC server configuration files in one request. Null or omitted sections are skipped.
-//	@Tags			Server Configuration
-//	@Accept			json
-//	@Produce		json
-//	@Param			id path string true "Server ID (UUID format)"
-//	@Param			restart query bool false "Restart the server after update"
-//	@Param			override query bool false "Override instead of merging with existing config"
-//	@Param			content body model.ConfigurationsUpdateRequest true "Configuration sections to update (null sections are skipped)"
-//	@Success		200	{array} model.Config "List of updated config audit records"
-//	@Failure		400	{object} error_handler.ErrorResponse "Invalid request or JSON format"
-//	@Failure		401	{object} error_handler.ErrorResponse "Unauthorized"
-//	@Failure		403	{object} error_handler.ErrorResponse "Insufficient permissions"
-//	@Failure		404	{object} error_handler.ErrorResponse "Server not found"
-//	@Failure		500	{object} error_handler.ErrorResponse "Internal server error"
-//	@Security		BearerAuth
-//	@Router			/server/{id}/config [patch]
-func (ac *ConfigController) UpdateAllConfigs(c *fiber.Ctx) error {
-	restart := c.QueryBool("restart")
-	serverID := c.Params("id")
-
-	if _, err := uuid.Parse(serverID); err != nil {
-		return ac.errorHandler.HandleUUIDError(c, "server ID")
-	}
-
-	c.Locals("serverId", serverID)
-
-	var req model.ConfigurationsUpdateRequest
-	if err := c.BodyParser(&req); err != nil {
-		return ac.errorHandler.HandleParsingError(c, err)
-	}
-
-	configs, err := ac.service.UpdateAllConfigs(c, &req)
-	if err != nil {
-		return ac.errorHandler.HandleServiceError(c, err)
-	}
-
-	if restart {
-		if _, err := ac.apiService.ServiceControlRestartServer(c); err != nil {
-			logging.ErrorWithContext("CONFIG_RESTART", "Failed to restart server after bulk config update: %v", err)
-		}
-	}
-
-	return c.JSON(configs)
-}
-
 // updateConfig returns Config
 //
 //	@Summary		Update server configuration file
--- a/local/controller/controller.go
+++ b/local/controller/controller.go
@@ -69,14 +69,4 @@ func InitializeControllers(c *dig.Container) {
 	if err != nil {
 		logging.Panic("unable to initialize steam controller")
 	}
-
-	err = c.Invoke(NewActivityLogController)
-	if err != nil {
-		logging.Panic("unable to initialize activity log controller")
-	}
-
-	err = c.Invoke(NewLogController)
-	if err != nil {
-		logging.Panic("unable to initialize log controller")
-	}
 }
--- a/local/controller/leaderboard.go
+++ b/local/controller/leaderboard.go
@@ -11,7 +11,6 @@ import (
 	"github.com/google/uuid"
 )

-
 type LeaderboardController struct {
 	service      *service.LeaderboardService
 	errorHandler *error_handler.ControllerErrorHandler
@@ -61,14 +60,7 @@ func (lc *LeaderboardController) Update(c *fiber.Ctx) error {
 		return lc.errorHandler.HandleParsingError(c, err)
 	}

-	userInfo, _ := c.Locals("userInfo").(*middleware.CachedUserInfo)
-	actorID, actorUsername := "", "system"
-	if userInfo != nil {
-		actorID = userInfo.UserID
-		actorUsername = userInfo.Username
-	}
-
-	data, err := lc.service.Update(c.UserContext(), serverID, &input, actorID, actorUsername)
+	data, err := lc.service.Update(c.UserContext(), serverID, &input)
 	if err != nil {
 		return lc.errorHandler.HandleServiceError(c, err)
 	}
--- a/local/controller/log.go
+++ b/local/controller/log.go
@@ -1,62 +0,0 @@
-package controller
-
-import (
-	"acc-server-manager/local/middleware"
-	"acc-server-manager/local/model"
-	"acc-server-manager/local/service"
-	"acc-server-manager/local/utl/common"
-	"acc-server-manager/local/utl/error_handler"
-	"strconv"
-
-	"github.com/gofiber/fiber/v2"
-	"github.com/google/uuid"
-)
-
-type LogController struct {
-	service      *service.ServerService
-	errorHandler *error_handler.ControllerErrorHandler
-}
-
-func NewLogController(ss *service.ServerService, routeGroups *common.RouteGroups, auth *middleware.AuthMiddleware) *LogController {
-	lc := &LogController{
-		service:      ss,
-		errorHandler: error_handler.NewControllerErrorHandler(),
-	}
-
-	logRoutes := routeGroups.Log
-	logRoutes.Use(auth.Authenticate)
-	logRoutes.Get("/", auth.HasPermission(model.ServerView), lc.GetLogLines)
-
-	return lc
-}
-
-// GetLogLines godoc
-// @Summary Get last N lines of server log
-// @Tags Server
-// @Param id path string true "Server ID"
-// @Param lines query int false "Number of lines to return (default 100)"
-// @Success 200 {object} object{lines=[]string}
-// @Security BearerAuth
-// @Router /server/{id}/log [get]
-func (lc *LogController) GetLogLines(c *fiber.Ctx) error {
-	serverIDStr := c.Params("id")
-	serverID, err := uuid.Parse(serverIDStr)
-	if err != nil {
-		return lc.errorHandler.HandleUUIDError(c, "server ID")
-	}
-
-	n, _ := strconv.Atoi(c.Query("lines", "100"))
-	if n <= 0 {
-		n = 100
-	}
-	if n > 10000 {
-		n = 10000
-	}
-
-	lines, err := lc.service.GetLastLogLines(c, serverID, n)
-	if err != nil {
-		return lc.errorHandler.HandleServiceError(c, err)
-	}
-
-	return c.JSON(fiber.Map{"lines": lines})
-}
--- a/local/controller/service_control.go
+++ b/local/controller/service_control.go
@@ -29,7 +29,6 @@ func NewServiceControlController(as *service.ServiceControlService, routeGroups
 	}

 	serviceRoutes := routeGroups.Server.Group("/:id/service")
-	serviceRoutes.Use(auth.Authenticate)
 	serviceRoutes.Get("/:service", ac.getStatus)
 	serviceRoutes.Post("/start", ac.startServer)
 	serviceRoutes.Post("/stop", ac.stopServer)
--- a/local/middleware/auth.go
+++ b/local/middleware/auth.go
@@ -115,7 +115,6 @@ func (m *AuthMiddleware) AuthenticateWithHandler(jwtHandler *jwt.JWTHandler, isO
 	if os.Getenv("TESTING_ENV") == "true" {
 		userInfo := CachedUserInfo{UserID: uuid.New().String(), Username: "test@example.com", RoleName: "Admin", Permissions: make(map[string]bool), CachedAt: time.Now()}
 		ctx.Locals("userID", userInfo.UserID)
-		ctx.Locals("actorUsername", userInfo.Username)
 		ctx.Locals("userInfo", userInfo)
 		ctx.Locals("authTime", time.Now())
 	} else {
@@ -128,7 +127,6 @@ func (m *AuthMiddleware) AuthenticateWithHandler(jwtHandler *jwt.JWTHandler, isO
 		}

 		ctx.Locals("userID", claims.UserID)
-		ctx.Locals("actorUsername", userInfo.Username)
 		ctx.Locals("userInfo", userInfo)
 		ctx.Locals("authTime", time.Now())
 	}
--- a/local/migrations/006_add_activity_log.go
+++ b/local/migrations/006_add_activity_log.go
@@ -1,33 +0,0 @@
-package migrations
-
-import (
-	"acc-server-manager/local/utl/logging"
-	"fmt"
-
-	"gorm.io/gorm"
-)
-
-func RunAddActivityLogMigration(db *gorm.DB) error {
-	if err := db.AutoMigrate(&MigrationRecord{}); err != nil {
-		return fmt.Errorf("failed to ensure migration_records table: %v", err)
-	}
-
-	var record MigrationRecord
-	if err := db.Where("migration_name = ?", "006_add_activity_log").First(&record).Error; err == nil {
-		logging.Info("Activity log migration already applied, skipping")
-		return nil
-	}
-
-	record = MigrationRecord{
-		MigrationName: "006_add_activity_log",
-		AppliedAt:     "datetime('now')",
-		Success:       true,
-		Notes:         "Added ActivityLog table via GORM AutoMigrate",
-	}
-	if err := db.Create(&record).Error; err != nil {
-		return fmt.Errorf("failed to record migration 006: %v", err)
-	}
-
-	logging.Info("Activity log migration recorded")
-	return nil
-}
--- a/local/model/activity_log.go
+++ b/local/model/activity_log.go
@@ -1,82 +0,0 @@
-package model
-
-import (
-	"time"
-
-	"github.com/google/uuid"
-	"gorm.io/gorm"
-)
-
-type ActionType string
-
-const (
-	ActionConfigUpdate      ActionType = "config_update"
-	ActionServerStart       ActionType = "server_start"
-	ActionServerStop        ActionType = "server_stop"
-	ActionServerRestart     ActionType = "server_restart"
-	ActionLeaderboardUpdate ActionType = "leaderboard_update"
-)
-
-type ActivityLog struct {
-	ID        uuid.UUID  `json:"id"        gorm:"type:uuid;primary_key;"`
-	ServerID  uuid.UUID  `json:"serverId"  gorm:"not null;type:uuid;index"`
-	Server    *Server    `json:"server,omitempty" gorm:"foreignKey:ServerID"`
-	UserID    string     `json:"userId"    gorm:"not null"`
-	Username  string     `json:"username"  gorm:"not null"`
-	Action    ActionType `json:"action"    gorm:"not null"`
-	Details   string     `json:"details"   gorm:"type:text"`
-	CreatedAt time.Time  `json:"createdAt"`
-}
-
-func (a *ActivityLog) BeforeCreate(tx *gorm.DB) error {
-	if a.ID == uuid.Nil {
-		a.ID = uuid.New()
-	}
-	if a.CreatedAt.IsZero() {
-		a.CreatedAt = time.Now().UTC()
-	}
-	return nil
-}
-
-type ActivityLogFilter struct {
-	BaseFilter
-	DateRangeFilter
-	UserID   string     `query:"user_id"`
-	Action   ActionType `query:"action"`
-	ServerID string     `query:"server_id"`
-}
-
-func (f *ActivityLogFilter) ApplyFilter(query *gorm.DB) *gorm.DB {
-	if f.ServerID != "" {
-		if serverUUID, err := uuid.Parse(f.ServerID); err == nil {
-			query = query.Where("server_id = ?", serverUUID)
-		}
-	}
-	if f.UserID != "" {
-		query = query.Where("user_id = ?", f.UserID)
-	}
-	if f.Action != "" {
-		query = query.Where("action = ?", f.Action)
-	}
-	timeZero := time.Time{}
-	if f.StartDate != timeZero {
-		query = query.Where("created_at >= ?", f.StartDate)
-	}
-	if f.EndDate != timeZero {
-		query = query.Where("created_at <= ?", f.EndDate)
-	}
-	return query
-}
-
-func (f *ActivityLogFilter) GetSorting() (field string, desc bool) {
-	if f.SortBy == "" {
-		return "created_at", true
-	}
-	return f.SortBy, f.SortDesc
-}
-
-type LastActivityInfo struct {
-	UpdatedAt time.Time  `json:"updatedAt"`
-	Username  string     `json:"username"`
-	Action    ActionType `json:"action"`
-}
--- a/local/model/config.go
+++ b/local/model/config.go
@@ -40,14 +40,6 @@ type Configurations struct {
 	Settings      ServerSettings `json:"settings"`
 }

-type ConfigurationsUpdateRequest struct {
-	Configuration *map[string]interface{} `json:"configuration"`
-	AssistRules   *map[string]interface{} `json:"assistRules"`
-	Event         *map[string]interface{} `json:"event"`
-	EventRules    *map[string]interface{} `json:"eventRules"`
-	Settings      *map[string]interface{} `json:"settings"`
-}
-
 type ServerSettings struct {
 	ServerName                 string    `json:"serverName"`
 	AdminPassword              string    `json:"adminPassword"`
--- a/local/model/server.go
+++ b/local/model/server.go
@@ -35,19 +35,18 @@ func (s *Server) ToServerAPI() *ServerAPI {
 }

 type Server struct {
-	ID           uuid.UUID         `gorm:"type:uuid;primary_key;" json:"id"`
-	Name         string            `gorm:"not null" json:"name"`
-	Status       ServiceStatus     `json:"status" gorm:"-"`
-	IP           string            `gorm:"not null" json:"-"`
-	Port         int               `gorm:"not null" json:"-"`
-	Path         string            `gorm:"not null" json:"path"`
-	ServiceName  string            `gorm:"not null" json:"serviceName"`
-	Platform     string            `gorm:"not null;default:'windows'" json:"platform"`
-	ContainerID  string            `gorm:"default:''" json:"-"`
-	State        *ServerState      `gorm:"-" json:"state"`
-	LastActivity *LastActivityInfo `gorm:"-" json:"lastActivity,omitempty"`
-	DateCreated  time.Time         `json:"dateCreated"`
-	FromSteamCMD bool              `gorm:"not null; default:true" json:"-"`
+	ID           uuid.UUID     `gorm:"type:uuid;primary_key;" json:"id"`
+	Name         string        `gorm:"not null" json:"name"`
+	Status       ServiceStatus `json:"status" gorm:"-"`
+	IP           string        `gorm:"not null" json:"-"`
+	Port         int           `gorm:"not null" json:"-"`
+	Path         string        `gorm:"not null" json:"path"`
+	ServiceName  string        `gorm:"not null" json:"serviceName"`
+	Platform     string        `gorm:"not null;default:'windows'" json:"platform"`
+	ContainerID  string        `gorm:"default:''" json:"-"`
+	State        *ServerState  `gorm:"-" json:"state"`
+	DateCreated  time.Time     `json:"dateCreated"`
+	FromSteamCMD bool          `gorm:"not null; default:true" json:"-"`
 }

 type PlayerState struct {
--- a/local/model/websocket.go
+++ b/local/model/websocket.go
@@ -33,7 +33,6 @@ const (
 	MessageTypeSteamOutput WebSocketMessageType = "steam_output"
 	MessageTypeError       WebSocketMessageType = "error"
 	MessageTypeComplete    WebSocketMessageType = "complete"
-	MessageTypeLogLine     WebSocketMessageType = "log_line"
 )

 type WebSocketMessage struct {
@@ -66,10 +65,6 @@ type CompleteMessage struct {
 	Message  string    `json:"message"`
 }

-type LogLineMessage struct {
-	Line string `json:"line"`
-}
-
 func GetStepDescription(step ServerCreationStep) string {
 	descriptions := map[ServerCreationStep]string{
 		StepValidation:        "Validating server configuration",
--- a/local/platform/interfaces.go
+++ b/local/platform/interfaces.go
@@ -25,5 +25,4 @@ type FirewallManager interface {
 type LogStreamer interface {
 	Start(ctx context.Context, server *model.Server, handleLine func(string)) error
 	Stop(serverID uuid.UUID)
-	GetLastLines(ctx context.Context, server *model.Server, n int) ([]string, error)
 }
--- a/local/repository/activity_log.go
+++ b/local/repository/activity_log.go
@@ -1,96 +0,0 @@
-package repository
-
-import (
-	"acc-server-manager/local/model"
-	"context"
-	"fmt"
-	"time"
-
-	"github.com/google/uuid"
-	"gorm.io/gorm"
-)
-
-type ActivityLogRepository struct {
-	*BaseRepository[model.ActivityLog, model.ActivityLogFilter]
-}
-
-func NewActivityLogRepository(db *gorm.DB) *ActivityLogRepository {
-	return &ActivityLogRepository{
-		BaseRepository: NewBaseRepository[model.ActivityLog, model.ActivityLogFilter](db, model.ActivityLog{}),
-	}
-}
-
-func (r *ActivityLogRepository) Insert(ctx context.Context, entry *model.ActivityLog) error {
-	return r.BaseRepository.Insert(ctx, entry)
-}
-
-func (r *ActivityLogRepository) GetAll(ctx context.Context, filter *model.ActivityLogFilter) (*[]model.ActivityLog, error) {
-	result := &[]model.ActivityLog{}
-	query := r.BaseRepository.db.WithContext(ctx).
-		Model(&model.ActivityLog{}).
-		Preload("Server")
-
-	query = filter.ApplyFilter(query)
-
-	offset, limit := filter.Pagination()
-	query = query.Offset(offset).Limit(limit)
-
-	field, desc := filter.GetSorting()
-	if desc {
-		query = query.Order(field + " DESC")
-	} else {
-		query = query.Order(field)
-	}
-
-	if err := query.Find(result).Error; err != nil {
-		return nil, fmt.Errorf("error getting activity logs: %w", err)
-	}
-	return result, nil
-}
-
-type lastActivityRow struct {
-	ServerID  string           `gorm:"column:server_id"`
-	CreatedAt time.Time        `gorm:"column:created_at"`
-	Username  string           `gorm:"column:username"`
-	Action    model.ActionType `gorm:"column:action"`
-}
-
-// GetLastActivityByServerIDs returns the most recent activity entry per server.
-// Uses a single GROUP BY query with MAX(created_at); SQLite selects the other
-// columns from the row that holds the max value — documented SQLite behaviour.
-func (r *ActivityLogRepository) GetLastActivityByServerIDs(ctx context.Context, serverIDs []uuid.UUID) (map[uuid.UUID]*model.LastActivityInfo, error) {
-	out := make(map[uuid.UUID]*model.LastActivityInfo)
-	if len(serverIDs) == 0 {
-		return out, nil
-	}
-
-	// Convert to string slice so the IN clause works with SQLite UUID strings.
-	ids := make([]string, len(serverIDs))
-	for i, id := range serverIDs {
-		ids[i] = id.String()
-	}
-
-	var rows []lastActivityRow
-	err := r.BaseRepository.db.WithContext(ctx).
-		Model(&model.ActivityLog{}).
-		Select("server_id, MAX(created_at) as created_at, username, action").
-		Where("server_id IN ?", ids).
-		Group("server_id").
-		Scan(&rows).Error
-	if err != nil {
-		return nil, err
-	}
-
-	for _, row := range rows {
-		serverUUID, err := uuid.Parse(row.ServerID)
-		if err != nil {
-			continue
-		}
-		out[serverUUID] = &model.LastActivityInfo{
-			UpdatedAt: row.CreatedAt,
-			Username:  row.Username,
-			Action:    row.Action,
-		}
-	}
-	return out, nil
-}
--- a/local/repository/repository.go
+++ b/local/repository/repository.go
@@ -20,7 +20,6 @@ func InitializeRepositories(c *dig.Container) {
 	c.Provide(NewSteamCredentialsRepository)
 	c.Provide(NewMembershipRepository)
 	c.Provide(NewLeaderboardRepository)
-	c.Provide(NewActivityLogRepository)

 	if err := c.Provide(func() *model.Steam2FAManager {
 		manager := model.NewSteam2FAManager()
--- a/local/service/activity_log.go
+++ b/local/service/activity_log.go
@@ -1,65 +0,0 @@
-package service
-
-import (
-	"acc-server-manager/local/model"
-	"acc-server-manager/local/repository"
-	"acc-server-manager/local/utl/logging"
-	"context"
-	"encoding/json"
-	"fmt"
-)
-
-type ActivityLogService struct {
-	repo *repository.ActivityLogRepository
-}
-
-func NewActivityLogService(repo *repository.ActivityLogRepository) *ActivityLogService {
-	return &ActivityLogService{repo: repo}
-}
-
-// Log persists an activity log entry. Errors are logged but not returned so
-// callers can treat this as fire-and-forget.
-func (s *ActivityLogService) Log(ctx context.Context, entry *model.ActivityLog) error {
-	if err := s.repo.Insert(ctx, entry); err != nil {
-		logging.Error("Failed to insert activity log: %v", err)
-		return err
-	}
-	return nil
-}
-
-func (s *ActivityLogService) GetAll(ctx context.Context, filter *model.ActivityLogFilter) (*[]model.ActivityLog, error) {
-	return s.repo.GetAll(ctx, filter)
-}
-
-// BuildConfigDetails produces a JSON string summarising which top-level keys
-// changed between oldJSON and newJSON.
-func BuildConfigDetails(file string, oldJSON, newJSON []byte) string {
-	var oldMap, newMap map[string]interface{}
-
-	if err := json.Unmarshal(oldJSON, &oldMap); err != nil {
-		oldMap = map[string]interface{}{}
-	}
-	if err := json.Unmarshal(newJSON, &newMap); err != nil {
-		newMap = map[string]interface{}{}
-	}
-
-	var changedKeys []string
-	for key, newVal := range newMap {
-		oldVal, exists := oldMap[key]
-		if !exists {
-			changedKeys = append(changedKeys, key)
-			continue
-		}
-		oldBytes, _ := json.Marshal(oldVal)
-		newBytes, _ := json.Marshal(newVal)
-		if string(oldBytes) != string(newBytes) {
-			changedKeys = append(changedKeys, key)
-		}
-	}
-
-	if len(changedKeys) == 0 {
-		return ""
-	}
-	keysJSON, _ := json.Marshal(changedKeys)
-	return fmt.Sprintf(`{"file":%q,"changed_keys":%s}`, file, string(keysJSON))
-}
--- a/local/service/config.go
+++ b/local/service/config.go
@@ -68,16 +68,14 @@ type ConfigService struct {
 	repository       *repository.ConfigRepository
 	serverRepository *repository.ServerRepository
 	serverService    *ServerService
-	activityLog      *ActivityLogService
 	configCache      *model.ServerConfigCache
 }

-func NewConfigService(repository *repository.ConfigRepository, serverRepository *repository.ServerRepository, activityLog *ActivityLogService) *ConfigService {
+func NewConfigService(repository *repository.ConfigRepository, serverRepository *repository.ServerRepository) *ConfigService {
 	logging.Debug("Initializing ConfigService with 5m expiration and 1s throttle")
 	return &ConfigService{
 		repository:       repository,
 		serverRepository: serverRepository,
-		activityLog:      activityLog,
 		configCache: model.NewServerConfigCache(model.CacheConfig{
 			ExpirationTime: 5 * time.Minute,
 			ThrottleTime:   1 * time.Second,
@@ -93,104 +91,12 @@ func (as *ConfigService) SetServerService(serverService *ServerService) {
 //	   		context.Context: Application context
 //		Returns:
 //			string: Application version
-func (as *ConfigService) UpdateAllConfigs(ctx *fiber.Ctx, req *model.ConfigurationsUpdateRequest) ([]*model.Config, error) {
-	serverID := ctx.Locals("serverId").(string)
-	override := ctx.QueryBool("override", false)
-
-	serverUUID, err := uuid.Parse(serverID)
-	if err != nil {
-		logging.Error("Invalid server ID format: %v", err)
-		return nil, fmt.Errorf("invalid server ID format")
-	}
-
-	server, err := as.serverRepository.GetByID(ctx.UserContext(), serverUUID)
-	if err != nil {
-		logging.Error("Server not found")
-		return nil, fmt.Errorf("server not found")
-	}
-
-	type configEntry struct {
-		fileName string
-		body     *map[string]interface{}
-	}
-
-	entries := []configEntry{
-		{ConfigurationJson, req.Configuration},
-		{AssistRulesJson, req.AssistRules},
-		{EventJson, req.Event},
-		{EventRulesJson, req.EventRules},
-		{SettingsJson, req.Settings},
-	}
-
-	actorID, _ := ctx.Locals("userID").(string)
-	actorUsername, _ := ctx.Locals("actorUsername").(string)
-	if actorUsername == "" {
-		actorUsername = "system"
-	}
-
-	var results []*model.Config
-	for _, entry := range entries {
-		if entry.body == nil {
-			continue
-		}
-		oldDataUTF8, newData, err := as.updateConfigFiles(ctx.UserContext(), server, entry.fileName, entry.body, override)
-		if err != nil {
-			return nil, err
-		}
-		if entry.fileName == SettingsJson {
-			if nameVal, ok := (*entry.body)["serverName"]; ok {
-				if nameStr, ok := nameVal.(string); ok && nameStr != "" && nameStr != server.Name {
-					server.Name = nameStr
-					if err := as.serverRepository.Update(ctx.UserContext(), server); err != nil {
-						logging.Error("Failed to update server name in DB: %v", err)
-					}
-				}
-			}
-		}
-		result := as.repository.UpdateConfig(ctx.UserContext(), &model.Config{
-			ServerID:   serverUUID,
-			ConfigFile: entry.fileName,
-			OldConfig:  string(oldDataUTF8),
-			NewConfig:  string(newData),
-			ChangedAt:  time.Now(),
-		})
-		results = append(results, result)
-
-		if as.activityLog != nil {
-			if details := BuildConfigDetails(entry.fileName, oldDataUTF8, newData); details != "" {
-				go func(details string) {
-					_ = as.activityLog.Log(context.Background(), &model.ActivityLog{
-						ServerID: serverUUID,
-						UserID:   actorID,
-						Username: actorUsername,
-						Action:   model.ActionConfigUpdate,
-						Details:  details,
-					})
-				}(details)
-			}
-		}
-	}
-
-	if len(results) > 0 {
-		as.configCache.InvalidateServerCache(serverID)
-		as.serverService.StartAccServerRuntime(server)
-	}
-
-	return results, nil
-}
-
 func (as *ConfigService) UpdateConfig(ctx *fiber.Ctx, body *map[string]interface{}) (*model.Config, error) {
 	serverID := ctx.Locals("serverId").(string)
 	configFile := ctx.Params("file")
 	override := ctx.QueryBool("override", false)

-	actorID, _ := ctx.Locals("userID").(string)
-	actorUsername, _ := ctx.Locals("actorUsername").(string)
-	if actorUsername == "" {
-		actorUsername = "system"
-	}
-
-	return as.updateConfigInternal(ctx.UserContext(), serverID, configFile, body, override, actorID, actorUsername)
+	return as.updateConfigInternal(ctx.UserContext(), serverID, configFile, body, override)
 }

 func (as *ConfigService) updateConfigFiles(ctx context.Context, server *model.Server, configFile string, body *map[string]interface{}, override bool) ([]byte, []byte, error) {
@@ -249,7 +155,7 @@ func (as *ConfigService) updateConfigFiles(ctx context.Context, server *model.Se
 	return oldDataUTF8, newData, nil
 }

-func (as *ConfigService) updateConfigInternal(ctx context.Context, serverID string, configFile string, body *map[string]interface{}, override bool, actorID, actorUsername string) (*model.Config, error) {
+func (as *ConfigService) updateConfigInternal(ctx context.Context, serverID string, configFile string, body *map[string]interface{}, override bool) (*model.Config, error) {
 	serverUUID, err := uuid.Parse(serverID)
 	if err != nil {
 		logging.Error("Invalid server ID format: %v", err)
@@ -267,34 +173,9 @@ func (as *ConfigService) updateConfigInternal(ctx context.Context, serverID stri
 		return nil, err
 	}

-	if configFile == SettingsJson {
-		if nameVal, ok := (*body)["serverName"]; ok {
-			if nameStr, ok := nameVal.(string); ok && nameStr != "" && nameStr != server.Name {
-				server.Name = nameStr
-				if err := as.serverRepository.Update(ctx, server); err != nil {
-					logging.Error("Failed to update server name in DB: %v", err)
-				}
-			}
-		}
-	}
-
 	as.configCache.InvalidateServerCache(serverID)
+
 	as.serverService.StartAccServerRuntime(server)
-
-	if as.activityLog != nil {
-		if details := BuildConfigDetails(configFile, oldDataUTF8, newData); details != "" {
-			go func() {
-				_ = as.activityLog.Log(context.Background(), &model.ActivityLog{
-					ServerID: serverUUID,
-					UserID:   actorID,
-					Username: actorUsername,
-					Action:   model.ActionConfigUpdate,
-					Details:  details,
-				})
-			}()
-		}
-	}
-
 	return as.repository.UpdateConfig(ctx, &model.Config{
 		ServerID:   serverUUID,
 		ConfigFile: configFile,
@@ -539,14 +420,6 @@ func (as *ConfigService) GetConfiguration(server *model.Server) (*model.Configur
 	return &config, nil
 }

-func (as *ConfigService) SetIgnorePrematureDisconnects(server *model.Server, value int) error {
-	configMap := map[string]interface{}{
-		"ignorePrematureDisconnects": value,
-	}
-	_, _, err := as.updateConfigFiles(context.Background(), server, SettingsJson, &configMap, false)
-	return err
-}
-
 func (as *ConfigService) SaveConfiguration(server *model.Server, config *model.Configuration) error {
 	configMap := make(map[string]interface{})
 	configBytes, err := json.Marshal(config)
@@ -560,11 +433,3 @@ func (as *ConfigService) SaveConfiguration(server *model.Server, config *model.C
 	_, _, err = as.updateConfigFiles(context.Background(), server, ConfigurationJson, &configMap, true)
 	return err
 }
-
-func (as *ConfigService) SetServerName(server *model.Server, name string) error {
-	configMap := map[string]interface{}{
-		"serverName": name,
-	}
-	_, _, err := as.updateConfigFiles(context.Background(), server, SettingsJson, &configMap, false)
-	return err
-}
--- a/local/service/docker_log_streamer.go
+++ b/local/service/docker_log_streamer.go
@@ -6,9 +6,7 @@ import (
 	"bufio"
 	"context"
 	"io"
-	"strconv"
 	"sync"
-	"time"

 	"github.com/docker/docker/api/types"
 	dockerclient "github.com/docker/docker/client"
@@ -26,14 +24,14 @@ func NewDockerLogStreamer(client *dockerclient.Client) *DockerLogStreamer {
 }

 func (s *DockerLogStreamer) Start(ctx context.Context, server *model.Server, handleLine func(string)) error {
-	s.Stop(server.ID)
-
+	if _, exists := s.cancels.Load(server.ID); exists {
+		return nil
+	}
 	if server.ContainerID == "" {
 		logging.Warn("DockerLogStreamer.Start: no container ID for server %s, skipping", server.ID)
 		return nil
 	}

-	since := time.Now().UTC().Format(time.RFC3339)
 	streamCtx, cancel := context.WithCancel(ctx)
 	s.cancels.Store(server.ID, cancel)

@@ -45,7 +43,6 @@ func (s *DockerLogStreamer) Start(ctx context.Context, server *model.Server, han
 			ShowStderr: true,
 			Follow:     true,
 			Timestamps: false,
-			Since:      since,
 		})
 		if err != nil {
 			logging.Error("DockerLogStreamer: failed to attach to container %s: %v", server.ContainerID[:12], err)
@@ -75,34 +72,3 @@ func (s *DockerLogStreamer) Stop(serverID uuid.UUID) {
 		v.(context.CancelFunc)()
 	}
 }
-
-func (s *DockerLogStreamer) GetLastLines(ctx context.Context, server *model.Server, n int) ([]string, error) {
-	if n <= 0 || server.ContainerID == "" {
-		return []string{}, nil
-	}
-
-	rc, err := s.client.ContainerLogs(ctx, server.ContainerID, types.ContainerLogsOptions{
-		ShowStdout: true,
-		ShowStderr: true,
-		Tail:       strconv.Itoa(n),
-	})
-	if err != nil {
-		return nil, err
-	}
-	defer rc.Close()
-
-	pr, pw := io.Pipe()
-	go func() {
-		defer pw.Close()
-		if _, err := stdcopy.StdCopy(pw, pw, rc); err != nil && err != io.EOF {
-			logging.Warn("DockerLogStreamer.GetLastLines: stdcopy error for %s: %v", server.ServiceName, err)
-		}
-	}()
-
-	var lines []string
-	scanner := bufio.NewScanner(pr)
-	for scanner.Scan() {
-		lines = append(lines, scanner.Text())
-	}
-	return lines, scanner.Err()
-}
--- a/local/service/docker_runtime.go
+++ b/local/service/docker_runtime.go
@@ -33,25 +33,23 @@ func NewDockerRuntime(client *dockerclient.Client, repo *repository.ServerReposi

 func (r *DockerRuntime) Create(ctx context.Context, server *model.Server) error {
 	image := env.GetACCImage()
-	// ACC uses the same port number for both TCP (client connections) and UDP (car positions/ping).
 	portStr := strconv.Itoa(server.Port)
-
-	natTCP, err := nat.NewPort("tcp", portStr)
+	natPort, err := nat.NewPort("tcp", portStr)
 	if err != nil {
 		return fmt.Errorf("invalid port %d: %v", server.Port, err)
 	}
-	natUDP, err := nat.NewPort("udp", portStr)
+	natPortUDP, err := nat.NewPort("udp", portStr)
 	if err != nil {
-		return fmt.Errorf("invalid port %d: %v", server.Port, err)
+		return fmt.Errorf("invalid udp port %d: %v", server.Port, err)
 	}

 	portBindings := nat.PortMap{
-		natTCP: []nat.PortBinding{{HostPort: portStr}},
-		natUDP: []nat.PortBinding{{HostPort: portStr}},
+		natPort:    []nat.PortBinding{{HostPort: portStr}},
+		natPortUDP: []nat.PortBinding{{HostPort: portStr}},
 	}
 	exposedPorts := nat.PortSet{
-		natTCP: struct{}{},
-		natUDP: struct{}{},
+		natPort:    struct{}{},
+		natPortUDP: struct{}{},
 	}

 	containerBase := env.GetACCServersPath()
@@ -73,8 +71,6 @@ func (r *DockerRuntime) Create(ctx context.Context, server *model.Server) error
 		Binds:         binds,
 		PortBindings:  portBindings,
 		RestartPolicy: container.RestartPolicy{Name: "unless-stopped"},
-		// NET_RAW is required for tcpdump packet capture in debug mode (DEBUG_MODE=1).
-		CapAdd: []string{"NET_RAW"},
 	}, nil, nil, server.ServiceName)
 	if err != nil {
 		return fmt.Errorf("failed to create container %s: %v", server.ServiceName, err)
@@ -106,19 +102,10 @@ func (r *DockerRuntime) Delete(ctx context.Context, serverID uuid.UUID) error {
 }

 func (r *DockerRuntime) Start(ctx context.Context, serverID uuid.UUID) (string, error) {
-	server, err := r.repo.GetByID(ctx, serverID)
-	if err != nil {
-		return "", fmt.Errorf("failed to look up server %s: %v", serverID, err)
-	}
-	if server == nil {
-		return "", fmt.Errorf("server %s not found", serverID)
-	}
-
-	containerID, err := r.ensureContainer(ctx, server)
+	containerID, err := r.resolveContainerID(ctx, serverID)
 	if err != nil {
 		return "", err
 	}
-
 	if err := r.client.ContainerStart(ctx, containerID, types.ContainerStartOptions{}); err != nil {
 		return "", fmt.Errorf("failed to start container: %v", err)
 	}
@@ -137,44 +124,16 @@ func (r *DockerRuntime) Stop(ctx context.Context, serverID uuid.UUID) (string, e
 }

 func (r *DockerRuntime) Restart(ctx context.Context, serverID uuid.UUID) (string, error) {
-	server, err := r.repo.GetByID(ctx, serverID)
-	if err != nil {
-		return "", fmt.Errorf("failed to look up server %s: %v", serverID, err)
-	}
-	if server == nil {
-		return "", fmt.Errorf("server %s not found", serverID)
-	}
-
-	containerID, err := r.ensureContainer(ctx, server)
+	containerID, err := r.resolveContainerID(ctx, serverID)
 	if err != nil {
 		return "", err
 	}
-
 	if err := r.client.ContainerRestart(ctx, containerID, container.StopOptions{}); err != nil {
 		return "", fmt.Errorf("failed to restart container: %v", err)
 	}
 	return model.StatusRunning.String(), nil
 }

-// ensureContainer returns the container ID for a server, recreating the container
-// from the server's current DB record if it no longer exists in Docker.
-func (r *DockerRuntime) ensureContainer(ctx context.Context, server *model.Server) (string, error) {
-	if server.ContainerID != "" {
-		if _, err := r.client.ContainerInspect(ctx, server.ContainerID); err == nil {
-			return server.ContainerID, nil
-		}
-		logging.Info("Container %s for server %s no longer exists, recreating", server.ContainerID[:min(12, len(server.ContainerID))], server.ID)
-	}
-
-	if err := r.Create(ctx, server); err != nil {
-		return "", fmt.Errorf("failed to recreate container: %v", err)
-	}
-	if err := r.repo.Update(ctx, server); err != nil {
-		return "", fmt.Errorf("container recreated but failed to persist container ID: %v", err)
-	}
-	return server.ContainerID, nil
-}
-
 func (r *DockerRuntime) Status(ctx context.Context, serverID uuid.UUID) (string, error) {
 	server, err := r.repo.GetByID(ctx, serverID)
 	if err != nil || server == nil {
--- a/local/service/file_log_streamer.go
+++ b/local/service/file_log_streamer.go
@@ -3,9 +3,7 @@ package service
 import (
 	"acc-server-manager/local/model"
 	"acc-server-manager/local/utl/tracking"
-	"bufio"
 	"context"
-	"os"
 	"path/filepath"
 	"sync"

@@ -38,40 +36,3 @@ func (s *FileLogStreamer) Stop(serverID uuid.UUID) {
 		v.(*tracking.LogTailer).Stop()
 	}
 }
-
-func (s *FileLogStreamer) GetLastLines(_ context.Context, server *model.Server, n int) ([]string, error) {
-	if n <= 0 {
-		return []string{}, nil
-	}
-	logPath := filepath.Join(server.GetLogPath(), "server.log")
-	f, err := os.Open(logPath)
-	if err != nil {
-		if os.IsNotExist(err) {
-			return []string{}, nil
-		}
-		return nil, err
-	}
-	defer f.Close()
-
-	ring := make([]string, n)
-	head := 0
-	count := 0
-	scanner := bufio.NewScanner(f)
-	for scanner.Scan() {
-		ring[head] = scanner.Text()
-		head = (head + 1) % n
-		if count < n {
-			count++
-		}
-	}
-	if err := scanner.Err(); err != nil {
-		return nil, err
-	}
-	if count < n {
-		return ring[:count], nil
-	}
-	out := make([]string, n)
-	copy(out, ring[head:])
-	copy(out[n-head:], ring[:head])
-	return out, nil
-}
--- a/local/service/leaderboard.go
+++ b/local/service/leaderboard.go
@@ -3,7 +3,6 @@ package service
 import (
 	"acc-server-manager/local/model"
 	"acc-server-manager/local/repository"
-	"acc-server-manager/local/utl/logging"
 	"context"
 	"fmt"

@@ -11,12 +10,11 @@ import (
 )

 type LeaderboardService struct {
-	repo        *repository.LeaderboardRepository
-	activityLog *ActivityLogService
+	repo *repository.LeaderboardRepository
 }

-func NewLeaderboardService(repo *repository.LeaderboardRepository, activityLog *ActivityLogService) *LeaderboardService {
-	return &LeaderboardService{repo: repo, activityLog: activityLog}
+func NewLeaderboardService(repo *repository.LeaderboardRepository) *LeaderboardService {
+	return &LeaderboardService{repo: repo}
 }

 // Get returns the leaderboard for a server.
@@ -25,7 +23,7 @@ func (s *LeaderboardService) Get(ctx context.Context, serverID uuid.UUID) (*mode
 }

 // Update replaces the leaderboard for a server.
-func (s *LeaderboardService) Update(ctx context.Context, serverID uuid.UUID, lb *model.Leaderboard, actorID, actorUsername string) (*model.Leaderboard, error) {
+func (s *LeaderboardService) Update(ctx context.Context, serverID uuid.UUID, lb *model.Leaderboard) (*model.Leaderboard, error) {
 	if lb == nil {
 		return nil, fmt.Errorf("input is required")
 	}
@@ -35,25 +33,5 @@ func (s *LeaderboardService) Update(ctx context.Context, serverID uuid.UUID, lb
 	for i := range lb.Races {
 		lb.Races[i].Position = i
 	}
-	result, err := s.repo.FullReplace(ctx, serverID, lb)
-	if err != nil {
-		return nil, err
-	}
-
-	driverCount := len(lb.Drivers)
-	raceCount := len(lb.Races)
-	details := fmt.Sprintf(`{"driver_count":%d,"race_count":%d}`, driverCount, raceCount)
-	go func() {
-		if logErr := s.activityLog.Log(context.Background(), &model.ActivityLog{
-			ServerID: serverID,
-			UserID:   actorID,
-			Username: actorUsername,
-			Action:   model.ActionLeaderboardUpdate,
-			Details:  details,
-		}); logErr != nil {
-			logging.Error("Failed to log leaderboard update: %v", logErr)
-		}
-	}()
-
-	return result, nil
+	return s.repo.FullReplace(ctx, serverID, lb)
 }
--- a/local/service/server.go
+++ b/local/service/server.go
@@ -26,13 +26,12 @@ const (
 type ServerService struct {
 	repository       *repository.ServerRepository
 	stateHistoryRepo *repository.StateHistoryRepository
-	activityLogRepo  *repository.ActivityLogRepository
 	apiService       *ServiceControlService
 	configService    *ConfigService
 	steamService     *SteamService
 	runtime          platform.ServerRuntime
 	firewall         platform.FirewallManager
-	logStreamer       platform.LogStreamer
+	logStreamer      platform.LogStreamer
 	portPool         *network.PortPoolManager
 	webSocketService *WebSocketService
 	instances        sync.Map // uuid.UUID → *tracking.AccServerInstance
@@ -48,31 +47,15 @@ type pendingState struct {

 func (s *ServerService) ensureLogTailing(server *model.Server, instance *tracking.AccServerInstance) {
 	go func() {
-		handleFn := func(line string) {
-			instance.HandleLogLine(line)
-			s.webSocketService.BroadcastLogLine(server.ID, line)
-		}
-		if err := s.logStreamer.Start(context.Background(), server, handleFn); err != nil {
+		if err := s.logStreamer.Start(context.Background(), server, instance.HandleLogLine); err != nil {
 			logging.Error("Failed to start log streaming for server %s: %v", server.ID, err)
 		}
 	}()
 }

-func (s *ServerService) GetLastLogLines(ctx *fiber.Ctx, serverID uuid.UUID, n int) ([]string, error) {
-	server, err := s.repository.GetByID(ctx.UserContext(), serverID)
-	if err != nil {
-		return nil, err
-	}
-	if n <= 0 {
-		n = 100
-	}
-	return s.logStreamer.GetLastLines(ctx.UserContext(), server, n)
-}
-
 func NewServerService(
 	repository *repository.ServerRepository,
 	stateHistoryRepo *repository.StateHistoryRepository,
-	activityLogRepo *repository.ActivityLogRepository,
 	apiService *ServiceControlService,
 	configService *ConfigService,
 	steamService *SteamService,
@@ -85,7 +68,6 @@ func NewServerService(
 	service := &ServerService{
 		repository:       repository,
 		stateHistoryRepo: stateHistoryRepo,
-		activityLogRepo:  activityLogRepo,
 		apiService:       apiService,
 		configService:    configService,
 		steamService:     steamService,
@@ -284,16 +266,6 @@ func (s *ServerService) GetAll(ctx *fiber.Ctx, filter *model.ServerFilter) (*[]m
 		return nil, err
 	}

-	// Collect server IDs for a single last-activity lookup.
-	serverIDs := make([]uuid.UUID, len(*servers))
-	for i, srv := range *servers {
-		serverIDs[i] = srv.ID
-	}
-	lastActivities, laErr := s.activityLogRepo.GetLastActivityByServerIDs(ctx.UserContext(), serverIDs)
-	if laErr != nil {
-		logging.Error("Failed to get last activities for server list: %v", laErr)
-	}
-
 	for i := range *servers {
 		server := &(*servers)[i]
 		status, err := s.apiService.GetCachedStatus(server.ServiceName)
@@ -310,11 +282,6 @@ func (s *ServerService) GetAll(ctx *fiber.Ctx, filter *model.ServerFilter) (*[]m
 				server.State = serverInstance.State
 			}
 		}
-		if lastActivities != nil {
-			if info, ok := lastActivities[server.ID]; ok {
-				server.LastActivity = info
-			}
-		}
 	}

 	return servers, nil
@@ -436,10 +403,6 @@ func (s *ServerService) createServerBackground(ctx context.Context, server *mode
 					return "", fmt.Errorf("failed to update server configuration: %v", err)
 				}

-				if err := s.configService.SetServerName(server, server.Name); err != nil {
-					logging.Error("Failed to set server name in config: %v", err)
-				}
-
 				return fmt.Sprintf("Server configuration generated (Port: %d)", serverPort), nil
 			},
 		},
@@ -611,17 +574,10 @@ func (s *ServerService) updateServerPort(server *model.Server, port int) error {

 	config.TcpPort = model.IntString(port)
 	config.UdpPort = model.IntString(port)
-	config.RegisterToLobby = model.IntString(1)

 	if err := s.configService.SaveConfiguration(server, config); err != nil {
 		return fmt.Errorf("failed to save server configuration: %v", err)
 	}

-	if env.IsDockerPlatform() {
-		if err := s.configService.SetIgnorePrematureDisconnects(server, 0); err != nil {
-			logging.Error("Failed to set ignorePrematureDisconnects for Docker server: %v", err)
-		}
-	}
-
 	return nil
 }
--- a/local/service/service.go
+++ b/local/service/service.go
@@ -23,7 +23,6 @@ func InitializeServices(c *dig.Container) {

 	logging.Debug("Registering services")
 	c.Provide(NewSteamService)
-	c.Provide(NewActivityLogService)
 	c.Provide(NewServerService)
 	c.Provide(NewStateHistoryService)
 	c.Provide(NewServiceControlService)
--- a/local/service/service_control.go
+++ b/local/service/service_control.go
@@ -15,7 +15,6 @@ type ServiceControlService struct {
 	repository       *repository.ServiceControlRepository
 	serverRepository *repository.ServerRepository
 	serverService    *ServerService
-	activityLog      *ActivityLogService
 	statusCache      *model.ServerStatusCache
 	runtime          platform.ServerRuntime
 }
@@ -24,13 +23,11 @@ func NewServiceControlService(
 	repository *repository.ServiceControlRepository,
 	serverRepository *repository.ServerRepository,
 	runtime platform.ServerRuntime,
-	activityLog *ActivityLogService,
 ) *ServiceControlService {
 	return &ServiceControlService{
 		repository:       repository,
 		serverRepository: serverRepository,
 		runtime:          runtime,
-		activityLog:      activityLog,
 		statusCache: model.NewServerStatusCache(model.CacheConfig{
 			ExpirationTime: 30 * time.Second,
 			ThrottleTime:   5 * time.Second,
@@ -39,28 +36,6 @@ func NewServiceControlService(
 	}
 }

-// getServerFromCtx resolves the server from ctx locals (serverId or service name).
-func (as *ServiceControlService) getServerFromCtx(ctx *fiber.Ctx) (*model.Server, error) {
-	serviceName, ok := ctx.Locals("service").(string)
-	if !ok || serviceName == "" {
-		serverId, ok2 := ctx.Locals("serverId").(string)
-		if !ok2 || serverId == "" {
-			return nil, errors.New("service name missing")
-		}
-		return as.serverRepository.GetByID(ctx.UserContext(), serverId)
-	}
-	return as.serverRepository.GetFirstByServiceName(ctx.UserContext(), serviceName)
-}
-
-func extractActor(ctx *fiber.Ctx) (actorID, actorUsername string) {
-	actorID, _ = ctx.Locals("userID").(string)
-	actorUsername, _ = ctx.Locals("actorUsername").(string)
-	if actorUsername == "" {
-		actorUsername = "system"
-	}
-	return
-}
-
 func (as *ServiceControlService) SetServerService(serverService *ServerService) {
 	as.serverService = serverService
 }
@@ -86,11 +61,10 @@ func (as *ServiceControlService) GetStatus(ctx *fiber.Ctx) (string, error) {
 }

 func (as *ServiceControlService) ServiceControlStartServer(ctx *fiber.Ctx) (string, error) {
-	server, err := as.getServerFromCtx(ctx)
+	serviceName, err := as.GetServiceName(ctx)
 	if err != nil {
 		return "", err
 	}
-	serviceName := server.ServiceName

 	as.statusCache.UpdateStatus(serviceName, model.StatusStarting)

@@ -105,29 +79,14 @@ func (as *ServiceControlService) ServiceControlStartServer(ctx *fiber.Ctx) (stri

 	status := model.ParseServiceStatus(statusStr)
 	as.statusCache.UpdateStatus(serviceName, status)
-
-	if as.activityLog != nil {
-		actorID, actorUsername := extractActor(ctx)
-		go func() {
-			_ = as.activityLog.Log(context.Background(), &model.ActivityLog{
-				ServerID: server.ID,
-				UserID:   actorID,
-				Username: actorUsername,
-				Action:   model.ActionServerStart,
-				Details:  `{"service":"` + serviceName + `"}`,
-			})
-		}()
-	}
-
 	return status.String(), nil
 }

 func (as *ServiceControlService) ServiceControlStopServer(ctx *fiber.Ctx) (string, error) {
-	server, err := as.getServerFromCtx(ctx)
+	serviceName, err := as.GetServiceName(ctx)
 	if err != nil {
 		return "", err
 	}
-	serviceName := server.ServiceName

 	as.statusCache.UpdateStatus(serviceName, model.StatusStopping)

@@ -142,29 +101,14 @@ func (as *ServiceControlService) ServiceControlStopServer(ctx *fiber.Ctx) (strin

 	status := model.ParseServiceStatus(statusStr)
 	as.statusCache.UpdateStatus(serviceName, status)
-
-	if as.activityLog != nil {
-		actorID, actorUsername := extractActor(ctx)
-		go func() {
-			_ = as.activityLog.Log(context.Background(), &model.ActivityLog{
-				ServerID: server.ID,
-				UserID:   actorID,
-				Username: actorUsername,
-				Action:   model.ActionServerStop,
-				Details:  `{"service":"` + serviceName + `"}`,
-			})
-		}()
-	}
-
 	return status.String(), nil
 }

 func (as *ServiceControlService) ServiceControlRestartServer(ctx *fiber.Ctx) (string, error) {
-	server, err := as.getServerFromCtx(ctx)
+	serviceName, err := as.GetServiceName(ctx)
 	if err != nil {
 		return "", err
 	}
-	serviceName := server.ServiceName

 	as.statusCache.UpdateStatus(serviceName, model.StatusRestarting)

@@ -179,20 +123,6 @@ func (as *ServiceControlService) ServiceControlRestartServer(ctx *fiber.Ctx) (st

 	status := model.ParseServiceStatus(statusStr)
 	as.statusCache.UpdateStatus(serviceName, status)
-
-	if as.activityLog != nil {
-		actorID, actorUsername := extractActor(ctx)
-		go func() {
-			_ = as.activityLog.Log(context.Background(), &model.ActivityLog{
-				ServerID: server.ID,
-				UserID:   actorID,
-				Username: actorUsername,
-				Action:   model.ActionServerRestart,
-				Details:  `{"service":"` + serviceName + `"}`,
-			})
-		}()
-	}
-
 	return status.String(), nil
 }

--- a/local/service/websocket.go
+++ b/local/service/websocket.go
@@ -103,16 +103,6 @@ func (ws *WebSocketService) BroadcastError(serverID uuid.UUID, error string, det
 	ws.broadcastToServer(serverID, wsMsg)
 }

-func (ws *WebSocketService) BroadcastLogLine(serverID uuid.UUID, line string) {
-	msg := model.WebSocketMessage{
-		Type:      model.MessageTypeLogLine,
-		ServerID:  &serverID,
-		Timestamp: time.Now().Unix(),
-		Data:      model.LogLineMessage{Line: line},
-	}
-	ws.broadcastToServer(serverID, msg)
-}
-
 func (ws *WebSocketService) BroadcastComplete(serverID uuid.UUID, success bool, message string) {
 	completeMsg := model.CompleteMessage{
 		ServerID: serverID,
--- a/local/utl/common/common.go
+++ b/local/utl/common/common.go
@@ -28,9 +28,6 @@ type RouteGroups struct {
 	WebSocket    fiber.Router
 	Leaderboard  fiber.Router
 	Steam        fiber.Router
-	ActivityLog  fiber.Router
-	Groups       fiber.Router
-	Log          fiber.Router
 }

 func CheckError(err error) {
--- a/local/utl/configs/configs.go
+++ b/local/utl/configs/configs.go
@@ -8,7 +8,7 @@ import (
 )

 var (
-	Version       = "0.13.0"
+	Version       = "0.10.7"
 	Prefix        = "v1"
 	Secret        string
 	SecretCode    string
--- a/local/utl/db/db.go
+++ b/local/utl/db/db.go
@@ -54,7 +54,6 @@ func Migrate(db *gorm.DB) {
 		&model.LeaderboardRace{},
 		&model.LeaderboardResult{},
 		&model.LeaderboardPointRow{},
-		&model.ActivityLog{},
 	)

 	if err != nil {
@@ -81,10 +80,6 @@ func runMigrations(db *gorm.DB) {
 		logging.Error("Failed to run platform columns migration: %v", err)
 	}

-	if err := migrations.RunAddActivityLogMigration(db); err != nil {
-		logging.Error("Failed to run activity log migration: %v", err)
-	}
-
 	logging.Info("Custom database migrations completed")
 }

--- a/tests/test_helper.go
+++ b/tests/test_helper.go
@@ -109,7 +109,7 @@ func createTestData(t *testing.T, tempDir string) *TestData {
 	configFiles := map[string]string{
 		"configuration.json": `{
 			"udpPort": "9231",
-			"tcpPort": "9231",
+			"tcpPort": "9232",
 			"maxConnections": "30",
 			"lanDiscovery": "1",
 			"registerToLobby": "1",
@@ -198,7 +198,7 @@ func createTestData(t *testing.T, tempDir string) *TestData {

 	sampleConfig := &model.Configuration{
 		UdpPort:         model.IntString(9231),
-		TcpPort:         model.IntString(9231),
+		TcpPort:         model.IntString(9232),
 		MaxConnections:  model.IntString(30),
 		LanDiscovery:    model.IntString(1),
 		RegisterToLobby: model.IntString(1),
--- a/tests/unit/controller/controller_simple_test.go
+++ b/tests/unit/controller/controller_simple_test.go
@@ -294,7 +294,7 @@ func TestController_ConfigurationModel_JSONSerialization(t *testing.T) {
 	app.Get("/config", func(c *fiber.Ctx) error {
 		config := &model.Configuration{
 			UdpPort:         model.IntString(9231),
-			TcpPort:         model.IntString(9231),
+			TcpPort:         model.IntString(9232),
 			MaxConnections:  model.IntString(30),
 			LanDiscovery:    model.IntString(1),
 			RegisterToLobby: model.IntString(1),
@@ -316,7 +316,7 @@ func TestController_ConfigurationModel_JSONSerialization(t *testing.T) {
 	tests.AssertNoError(t, err)

 	tests.AssertEqual(t, model.IntString(9231), response.UdpPort)
-	tests.AssertEqual(t, model.IntString(9231), response.TcpPort)
+	tests.AssertEqual(t, model.IntString(9232), response.TcpPort)
 	tests.AssertEqual(t, model.IntString(30), response.MaxConnections)
 	tests.AssertEqual(t, model.IntString(1), response.LanDiscovery)
 	tests.AssertEqual(t, model.IntString(1), response.RegisterToLobby)
--- a/tests/unit/service/cache_service_test.go
+++ b/tests/unit/service/cache_service_test.go
@@ -464,7 +464,7 @@ func TestServerConfigCache_Configuration(t *testing.T) {
 	serverID := uuid.New().String()
 	configuration := model.Configuration{
 		UdpPort:         model.IntString(9231),
-		TcpPort:         model.IntString(9231),
+		TcpPort:         model.IntString(9232),
 		MaxConnections:  model.IntString(30),
 		LanDiscovery:    model.IntString(1),
 		RegisterToLobby: model.IntString(1),
--- a/tests/unit/service/config_service_test.go
+++ b/tests/unit/service/config_service_test.go
@@ -20,14 +20,14 @@ func TestConfigService_GetConfiguration_ValidFile(t *testing.T) {

 	configRepo := repository.NewConfigRepository(helper.DB)
 	serverRepo := repository.NewServerRepository(helper.DB)
-	configService := service.NewConfigService(configRepo, serverRepo, nil)
+	configService := service.NewConfigService(configRepo, serverRepo)

 	config, err := configService.GetConfiguration(helper.TestData.Server)
 	tests.AssertNoError(t, err)
 	tests.AssertNotNil(t, config)

 	tests.AssertEqual(t, model.IntString(9231), config.UdpPort)
-	tests.AssertEqual(t, model.IntString(9231), config.TcpPort)
+	tests.AssertEqual(t, model.IntString(9232), config.TcpPort)
 	tests.AssertEqual(t, model.IntString(30), config.MaxConnections)
 	tests.AssertEqual(t, model.IntString(1), config.LanDiscovery)
 	tests.AssertEqual(t, model.IntString(1), config.RegisterToLobby)
@@ -43,7 +43,7 @@ func TestConfigService_GetEventConfig_ValidFile(t *testing.T) {

 	configRepo := repository.NewConfigRepository(helper.DB)
 	serverRepo := repository.NewServerRepository(helper.DB)
-	configService := service.NewConfigService(configRepo, serverRepo, nil)
+	configService := service.NewConfigService(configRepo, serverRepo)

 	eventConfig, err := configService.GetEventConfig(helper.TestData.Server)
 	tests.AssertNoError(t, err)
@@ -73,7 +73,7 @@ func TestConfigService_SaveConfiguration_Success(t *testing.T) {

 	configRepo := repository.NewConfigRepository(helper.DB)
 	serverRepo := repository.NewServerRepository(helper.DB)
-	configService := service.NewConfigService(configRepo, serverRepo, nil)
+	configService := service.NewConfigService(configRepo, serverRepo)

 	newConfig := &model.Configuration{
 		UdpPort:         model.IntString(9999),
@@ -115,14 +115,14 @@ func TestConfigService_LoadConfigs_Success(t *testing.T) {

 	configRepo := repository.NewConfigRepository(helper.DB)
 	serverRepo := repository.NewServerRepository(helper.DB)
-	configService := service.NewConfigService(configRepo, serverRepo, nil)
+	configService := service.NewConfigService(configRepo, serverRepo)

 	configs, err := configService.LoadConfigs(helper.TestData.Server)
 	tests.AssertNoError(t, err)
 	tests.AssertNotNil(t, configs)

 	tests.AssertEqual(t, model.IntString(9231), configs.Configuration.UdpPort)
-	tests.AssertEqual(t, model.IntString(9231), configs.Configuration.TcpPort)
+	tests.AssertEqual(t, model.IntString(9232), configs.Configuration.TcpPort)
 	tests.AssertEqual(t, "Test ACC Server", configs.Settings.ServerName)
 	tests.AssertEqual(t, "admin123", configs.Settings.AdminPassword)
 	tests.AssertEqual(t, "spa", configs.Event.Track)
@@ -142,7 +142,7 @@ func TestConfigService_MalformedJSON(t *testing.T) {

 	configRepo := repository.NewConfigRepository(helper.DB)
 	serverRepo := repository.NewServerRepository(helper.DB)
-	configService := service.NewConfigService(configRepo, serverRepo, nil)
+	configService := service.NewConfigService(configRepo, serverRepo)

 	config, err := configService.GetConfiguration(helper.TestData.Server)
 	if err == nil {
@@ -245,7 +245,7 @@ func TestConfigService_Caching_Configuration(t *testing.T) {

 	configRepo := repository.NewConfigRepository(helper.DB)
 	serverRepo := repository.NewServerRepository(helper.DB)
-	configService := service.NewConfigService(configRepo, serverRepo, nil)
+	configService := service.NewConfigService(configRepo, serverRepo)

 	config1, err := configService.GetConfiguration(helper.TestData.Server)
 	tests.AssertNoError(t, err)
@@ -264,7 +264,7 @@ func TestConfigService_Caching_Configuration(t *testing.T) {
 	tests.AssertNotNil(t, config2)

 	tests.AssertEqual(t, model.IntString(9231), config2.UdpPort)
-	tests.AssertEqual(t, model.IntString(9231), config2.TcpPort)
+	tests.AssertEqual(t, model.IntString(9232), config2.TcpPort)
 }

 func TestConfigService_Caching_EventConfig(t *testing.T) {
@@ -276,7 +276,7 @@ func TestConfigService_Caching_EventConfig(t *testing.T) {

 	configRepo := repository.NewConfigRepository(helper.DB)
 	serverRepo := repository.NewServerRepository(helper.DB)
-	configService := service.NewConfigService(configRepo, serverRepo, nil)
+	configService := service.NewConfigService(configRepo, serverRepo)

 	event1, err := configService.GetEventConfig(helper.TestData.Server)
 	tests.AssertNoError(t, err)
Author	SHA1	Message	Date
Fran Jurmanović	99d7e5fdc9	update server app path to host's	2026-03-19 18:24:19 +01:00
Fran Jurmanović	df2a826624	resolve server creation issues	2026-03-19 00:25:25 +01:00
Fran Jurmanović	863918a611	add docker specifics	2026-03-18 19:17:10 +01:00
Fran Jurmanović	98fea4e855	add platform interface according to env	2026-03-18 19:16:49 +01:00
Fran Jurmanović	96f3a5abc1	add docker specific columns to server table	2026-03-18 19:15:19 +01:00