Modern Docker Management, Designed for Everyone
Go composecontainer-managementcontainersdockerdocker-composedocker-managementgoself-hostedsveltekittypescriptweb-ui
fix: properly log error events to event table
Kyle Mendellcaef21052fb9
diff --git a/backend/internal/models/event.go b/backend/internal/models/event.goindex e5eb023b7..06becd74f 100644--- a/backend/internal/models/event.go+++ b/backend/internal/models/event.go@@ -16,10 +16,12 @@ const (EventTypeContainerCreate EventType = "container.create"EventTypeContainerScan EventType = "container.scan"EventTypeContainerUpdate EventType = "container.update"+ EventTypeContainerError EventType = "container.error"EventTypeImagePull EventType = "image.pull"EventTypeImageDelete EventType = "image.delete"EventTypeImageScan EventType = "image.scan"+ EventTypeImageError EventType = "image.error"EventTypeProjectDeploy EventType = "project.deploy"EventTypeProjectDelete EventType = "project.delete"@@ -27,12 +29,15 @@ const (EventTypeProjectStop EventType = "project.stop"EventTypeProjectCreate EventType = "project.create"EventTypeProjectUpdate EventType = "project.update"+ EventTypeProjectError EventType = "project.error"EventTypeVolumeCreate EventType = "volume.create"EventTypeVolumeDelete EventType = "volume.delete"+ EventTypeVolumeError EventType = "volume.error"EventTypeNetworkCreate EventType = "network.create"EventTypeNetworkDelete EventType = "network.delete"+ EventTypeNetworkError EventType = "network.error"EventTypeSystemPrune EventType = "system.prune"EventTypeUserLogin EventType = "user.login"diff --git a/backend/internal/services/container_service.go b/backend/internal/services/container_service.goindex e6c0aee23..2af24e05a 100644--- a/backend/internal/services/container_service.go+++ b/backend/internal/services/container_service.go@@ -32,6 +32,7 @@ func NewContainerService(db *database.DB, eventService *EventService, dockerServfunc (s *ContainerService) StartContainer(ctx context.Context, containerID string, user models.User) error {dockerClient, err := s.dockerService.CreateConnection(ctx)if err != nil {+ s.eventService.LogErrorEvent(ctx, models.EventTypeContainerError, "container", containerID, "", user.ID, user.Username, "0", err, models.JSON{"action": "start"})return fmt.Errorf("failed to connect to Docker: %w", err)}defer dockerClient.Close()@@ -47,12 +48,17 @@ func (s *ContainerService) StartContainer(ctx context.Context, containerID strinfmt.Printf("Could not log container start action: %s\n", err)}- return dockerClient.ContainerStart(ctx, containerID, container.StartOptions{})+ err = dockerClient.ContainerStart(ctx, containerID, container.StartOptions{})+ if err != nil {+ s.eventService.LogErrorEvent(ctx, models.EventTypeContainerError, "container", containerID, "", user.ID, user.Username, "0", err, models.JSON{"action": "start"})+ }+ return err}func (s *ContainerService) StopContainer(ctx context.Context, containerID string, user models.User) error {dockerClient, err := s.dockerService.CreateConnection(ctx)if err != nil {+ s.eventService.LogErrorEvent(ctx, models.EventTypeContainerError, "container", containerID, "", user.ID, user.Username, "0", err, models.JSON{"action": "stop"})return fmt.Errorf("failed to connect to Docker: %w", err)}defer dockerClient.Close()@@ -68,12 +74,17 @@ func (s *ContainerService) StopContainer(ctx context.Context, containerID string}timeout := 30- return dockerClient.ContainerStop(ctx, containerID, container.StopOptions{Timeout: &timeout})+ err = dockerClient.ContainerStop(ctx, containerID, container.StopOptions{Timeout: &timeout})+ if err != nil {+ s.eventService.LogErrorEvent(ctx, models.EventTypeContainerError, "container", containerID, "", user.ID, user.Username, "0", err, models.JSON{"action": "stop"})+ }+ return err}func (s *ContainerService) RestartContainer(ctx context.Context, containerID string, user models.User) error {dockerClient, err := s.dockerService.CreateConnection(ctx)if err != nil {+ s.eventService.LogErrorEvent(ctx, models.EventTypeContainerError, "container", containerID, "", user.ID, user.Username, "0", err, models.JSON{"action": "restart"})return fmt.Errorf("failed to connect to Docker: %w", err)}defer dockerClient.Close()@@ -88,7 +99,11 @@ func (s *ContainerService) RestartContainer(ctx context.Context, containerID strreturn fmt.Errorf("failed to log action: %w", err)}- return dockerClient.ContainerRestart(ctx, containerID, container.StopOptions{})+ err = dockerClient.ContainerRestart(ctx, containerID, container.StopOptions{})+ if err != nil {+ s.eventService.LogErrorEvent(ctx, models.EventTypeContainerError, "container", containerID, "", user.ID, user.Username, "0", err, models.JSON{"action": "restart"})+ }+ return err}func (s *ContainerService) GetContainerByID(ctx context.Context, id string) (*container.InspectResponse, error) {@@ -109,6 +124,7 @@ func (s *ContainerService) GetContainerByID(ctx context.Context, id string) (*cofunc (s *ContainerService) DeleteContainer(ctx context.Context, containerID string, force bool, removeVolumes bool, user models.User) error {dockerClient, err := s.dockerService.CreateConnection(ctx)if err != nil {+ s.eventService.LogErrorEvent(ctx, models.EventTypeContainerError, "container", containerID, "", user.ID, user.Username, "0", err, models.JSON{"action": "delete", "force": force, "removeVolumes": removeVolumes})return fmt.Errorf("failed to connect to Docker: %w", err)}defer dockerClient.Close()@@ -119,6 +135,7 @@ func (s *ContainerService) DeleteContainer(ctx context.Context, containerID striRemoveLinks: false,})if err != nil {+ s.eventService.LogErrorEvent(ctx, models.EventTypeContainerError, "container", containerID, "", user.ID, user.Username, "0", err, models.JSON{"action": "delete", "force": force, "removeVolumes": removeVolumes})return fmt.Errorf("failed to delete container: %w", err)}@@ -138,6 +155,7 @@ func (s *ContainerService) DeleteContainer(ctx context.Context, containerID strifunc (s *ContainerService) CreateContainer(ctx context.Context, config *container.Config, hostConfig *container.HostConfig, networkingConfig *network.NetworkingConfig, containerName string, user models.User) (*container.InspectResponse, error) {dockerClient, err := s.dockerService.CreateConnection(ctx)if err != nil {+ s.eventService.LogErrorEvent(ctx, models.EventTypeContainerError, "container", "", containerName, user.ID, user.Username, "0", err, models.JSON{"action": "create", "image": config.Image})return nil, fmt.Errorf("failed to connect to Docker: %w", err)}defer dockerClient.Close()@@ -146,18 +164,21 @@ func (s *ContainerService) CreateContainer(ctx context.Context, config *containeif err != nil {reader, pullErr := dockerClient.ImagePull(ctx, config.Image, image.PullOptions{})if pullErr != nil {+ s.eventService.LogErrorEvent(ctx, models.EventTypeContainerError, "container", "", containerName, user.ID, user.Username, "0", pullErr, models.JSON{"action": "create", "image": config.Image, "step": "pull_image"})return nil, fmt.Errorf("failed to pull image %s: %w", config.Image, pullErr)}defer reader.Close()_, copyErr := io.Copy(io.Discard, reader)if copyErr != nil {+ s.eventService.LogErrorEvent(ctx, models.EventTypeContainerError, "container", "", containerName, user.ID, user.Username, "0", copyErr, models.JSON{"action": "create", "image": config.Image, "step": "complete_pull"})return nil, fmt.Errorf("failed to complete image pull: %w", copyErr)}}resp, err := dockerClient.ContainerCreate(ctx, config, hostConfig, networkingConfig, nil, containerName)if err != nil {+ s.eventService.LogErrorEvent(ctx, models.EventTypeContainerError, "container", "", containerName, user.ID, user.Username, "0", err, models.JSON{"action": "create", "image": config.Image, "step": "create"})return nil, fmt.Errorf("failed to create container: %w", err)}@@ -172,11 +193,13 @@ func (s *ContainerService) CreateContainer(ctx context.Context, config *containeif err := dockerClient.ContainerStart(ctx, resp.ID, container.StartOptions{}); err != nil {_ = dockerClient.ContainerRemove(ctx, resp.ID, container.RemoveOptions{Force: true})+ s.eventService.LogErrorEvent(ctx, models.EventTypeContainerError, "container", resp.ID, containerName, user.ID, user.Username, "0", err, models.JSON{"action": "create", "image": config.Image, "step": "start"})return nil, fmt.Errorf("failed to start container: %w", err)}containerJSON, err := dockerClient.ContainerInspect(ctx, resp.ID)if err != nil {+ s.eventService.LogErrorEvent(ctx, models.EventTypeContainerError, "container", resp.ID, containerName, user.ID, user.Username, "0", err, models.JSON{"action": "create", "image": config.Image, "step": "inspect"})return nil, fmt.Errorf("failed to inspect created container: %w", err)}diff --git a/backend/internal/services/event_service.go b/backend/internal/services/event_service.goindex 5bfd1742f..e7eaf9c9f 100644--- a/backend/internal/services/event_service.go+++ b/backend/internal/services/event_service.go@@ -324,6 +324,41 @@ func (s *EventService) LogNetworkEvent(ctx context.Context, eventType models.Evereturn err}+func (s *EventService) LogErrorEvent(ctx context.Context, eventType models.EventType, resourceType, resourceID, resourceName, userID, username, environmentID string, err error, metadata models.JSON) {+ if err == nil {+ return+ }++ if metadata == nil {+ metadata = models.JSON{}+ }+ metadata["error"] = err.Error()++ title := fmt.Sprintf("%s error", strings.Title(resourceType))+ if resourceName != "" {+ title = fmt.Sprintf("%s error: %s", strings.Title(resourceType), resourceName)+ }++ description := fmt.Sprintf("Failed to perform operation on %s: %s", resourceType, err.Error())++ _, logErr := s.CreateEvent(ctx, CreateEventRequest{+ Type: eventType,+ Severity: models.EventSeverityError,+ Title: title,+ Description: description,+ ResourceType: &resourceType,+ ResourceID: &resourceID,+ ResourceName: &resourceName,+ UserID: &userID,+ Username: &username,+ EnvironmentID: &environmentID,+ Metadata: metadata,+ })+ if logErr != nil {+ fmt.Printf("Failed to log error event: %v\n", logErr)+ }+}+func (s *EventService) toEventDto(event *models.Event) *dto.EventDto {var metadata map[string]interface{}if event.Metadata != nil {diff --git a/backend/internal/services/image_service.go b/backend/internal/services/image_service.goindex f8821e58a..31c5a4d1b 100644--- a/backend/internal/services/image_service.go+++ b/backend/internal/services/image_service.go@@ -59,6 +59,7 @@ func (s *ImageService) GetImageByID(ctx context.Context, id string) (*image.Inspfunc (s *ImageService) RemoveImage(ctx context.Context, id string, force bool, user models.User) error {dockerClient, err := s.dockerService.CreateConnection(ctx)if err != nil {+ s.eventService.LogErrorEvent(ctx, models.EventTypeImageError, "image", id, "", user.ID, user.Username, "0", err, models.JSON{"action": "delete", "force": force})return fmt.Errorf("failed to connect to Docker: %w", err)}defer dockerClient.Close()@@ -78,6 +79,7 @@ func (s *ImageService) RemoveImage(ctx context.Context, id string, force bool, u_, err = dockerClient.ImageRemove(ctx, id, options)if err != nil {+ s.eventService.LogErrorEvent(ctx, models.EventTypeImageError, "image", id, imageName, user.ID, user.Username, "0", err, models.JSON{"action": "delete", "force": force})return fmt.Errorf("failed to remove image: %w", err)}@@ -100,6 +102,7 @@ func (s *ImageService) RemoveImage(ctx context.Context, id string, force bool, ufunc (s *ImageService) PullImage(ctx context.Context, imageName string, progressWriter io.Writer, user models.User, externalCreds []dto.ContainerRegistryCredential) error {dockerClient, err := s.dockerService.CreateConnection(ctx)if err != nil {+ s.eventService.LogErrorEvent(ctx, models.EventTypeImageError, "image", "", imageName, user.ID, user.Username, "0", err, models.JSON{"action": "pull"})return fmt.Errorf("failed to connect to Docker: %w", err)}defer dockerClient.Close()@@ -122,6 +125,7 @@ func (s *ImageService) PullImage(ctx context.Context, imageName string, progressslog.String("image", imageName),slog.Bool("hasAuth", pullOptions.RegistryAuth != ""),slog.String("error", err.Error()))+ s.eventService.LogErrorEvent(ctx, models.EventTypeImageError, "image", "", imageName, user.ID, user.Username, "0", err, models.JSON{"action": "pull"})return fmt.Errorf("failed to initiate image pull for %s: %w", imageName, err)}defer reader.Close()@@ -132,9 +136,11 @@ func (s *ImageService) PullImage(ctx context.Context, imageName string, progressfor scanner.Scan() {line := scanner.Bytes()if _, writeErr := progressWriter.Write(line); writeErr != nil {+ s.eventService.LogErrorEvent(ctx, models.EventTypeImageError, "image", "", imageName, user.ID, user.Username, "0", writeErr, models.JSON{"action": "pull", "step": "write_progress"})return fmt.Errorf("error writing pull progress for %s: %w", imageName, writeErr)}if _, writeErr := progressWriter.Write([]byte("\n")); writeErr != nil {+ s.eventService.LogErrorEvent(ctx, models.EventTypeImageError, "image", "", imageName, user.ID, user.Username, "0", writeErr, models.JSON{"action": "pull", "step": "write_newline"})return fmt.Errorf("error writing newline for %s: %w", imageName, writeErr)}@@ -145,8 +151,10 @@ func (s *ImageService) PullImage(ctx context.Context, imageName string, progressif scanErr := scanner.Err(); scanErr != nil {if errors.Is(scanErr, context.Canceled) || strings.Contains(scanErr.Error(), "context canceled") {slog.Debug("image pull stream canceled", slog.String("image", imageName), slog.Any("err", scanErr))+ s.eventService.LogErrorEvent(ctx, models.EventTypeImageError, "image", "", imageName, user.ID, user.Username, "0", scanErr, models.JSON{"action": "pull", "step": "canceled"})return fmt.Errorf("image pull stream canceled for %s: %w", imageName, scanErr)}+ s.eventService.LogErrorEvent(ctx, models.EventTypeImageError, "image", "", imageName, user.ID, user.Username, "0", scanErr, models.JSON{"action": "pull", "step": "read_stream"})return fmt.Errorf("error reading image pull stream for %s: %w", imageName, scanErr)}diff --git a/backend/internal/services/network_service.go b/backend/internal/services/network_service.goindex 2709dee90..00dbe4b57 100644--- a/backend/internal/services/network_service.go+++ b/backend/internal/services/network_service.go@@ -46,12 +46,14 @@ func (s *NetworkService) GetNetworkByID(ctx context.Context, id string) (*networfunc (s *NetworkService) CreateNetwork(ctx context.Context, name string, options network.CreateOptions, user models.User) (*network.CreateResponse, error) {dockerClient, err := s.dockerService.CreateConnection(ctx)if err != nil {+ s.eventService.LogErrorEvent(ctx, models.EventTypeNetworkError, "network", "", name, user.ID, user.Username, "0", err, models.JSON{"action": "create", "driver": options.Driver})return nil, fmt.Errorf("failed to connect to Docker: %w", err)}defer dockerClient.Close()response, err := dockerClient.NetworkCreate(ctx, name, options)if err != nil {+ s.eventService.LogErrorEvent(ctx, models.EventTypeNetworkError, "network", "", name, user.ID, user.Username, "0", err, models.JSON{"action": "create", "driver": options.Driver})return nil, fmt.Errorf("failed to create network: %w", err)}@@ -70,19 +72,21 @@ func (s *NetworkService) CreateNetwork(ctx context.Context, name string, optionsfunc (s *NetworkService) RemoveNetwork(ctx context.Context, id string, user models.User) error {dockerClient, err := s.dockerService.CreateConnection(ctx)if err != nil {+ s.eventService.LogErrorEvent(ctx, models.EventTypeNetworkError, "network", id, "", user.ID, user.Username, "0", err, models.JSON{"action": "delete"})return fmt.Errorf("failed to connect to Docker: %w", err)}defer dockerClient.Close()- networkDetails, inspectErr := dockerClient.NetworkInspect(ctx, id, network.InspectOptions{})+ networkInfo, err := dockerClient.NetworkInspect(ctx, id, network.InspectOptions{})var networkName string- if inspectErr == nil {- networkName = networkDetails.Name+ if err == nil {+ networkName = networkInfo.Name} else {networkName = id}if err := dockerClient.NetworkRemove(ctx, id); err != nil {+ s.eventService.LogErrorEvent(ctx, models.EventTypeNetworkError, "network", id, networkName, user.ID, user.Username, "0", err, models.JSON{"action": "delete"})return fmt.Errorf("failed to remove network: %w", err)}@@ -91,7 +95,7 @@ func (s *NetworkService) RemoveNetwork(ctx context.Context, id string, user mode"networkId": id,}if logErr := s.eventService.LogNetworkEvent(ctx, models.EventTypeNetworkDelete, id, networkName, user.ID, user.Username, "0", metadata); logErr != nil {- fmt.Printf("Could not log network deletion action: %s\n", logErr)+ fmt.Printf("Could not log network delete action: %s\n", logErr)}return nildiff --git a/backend/internal/services/volume_service.go b/backend/internal/services/volume_service.goindex 064e6083a..1f91f7181 100644--- a/backend/internal/services/volume_service.go+++ b/backend/internal/services/volume_service.go@@ -78,17 +78,20 @@ func (s *VolumeService) GetVolumeByName(ctx context.Context, name string) (*dto.func (s *VolumeService) CreateVolume(ctx context.Context, options volume.CreateOptions, user models.User) (*dto.VolumeDto, error) {dockerClient, err := s.dockerService.CreateConnection(ctx)if err != nil {+ s.eventService.LogErrorEvent(ctx, models.EventTypeVolumeError, "volume", "", options.Name, user.ID, user.Username, "0", err, models.JSON{"action": "create", "driver": options.Driver})return nil, fmt.Errorf("failed to connect to Docker: %w", err)}defer dockerClient.Close()created, err := dockerClient.VolumeCreate(ctx, options)if err != nil {+ s.eventService.LogErrorEvent(ctx, models.EventTypeVolumeError, "volume", "", options.Name, user.ID, user.Username, "0", err, models.JSON{"action": "create", "driver": options.Driver})return nil, fmt.Errorf("failed to create volume: %w", err)}vol, err := dockerClient.VolumeInspect(ctx, created.Name)if err != nil {+ s.eventService.LogErrorEvent(ctx, models.EventTypeVolumeError, "volume", created.Name, created.Name, user.ID, user.Username, "0", err, models.JSON{"action": "create", "driver": options.Driver, "step": "inspect"})return nil, fmt.Errorf("failed to inspect created volume: %w", err)}@@ -112,18 +115,19 @@ func (s *VolumeService) CreateVolume(ctx context.Context, options volume.CreateOfunc (s *VolumeService) DeleteVolume(ctx context.Context, name string, force bool, user models.User) error {dockerClient, err := s.dockerService.CreateConnection(ctx)if err != nil {+ s.eventService.LogErrorEvent(ctx, models.EventTypeVolumeError, "volume", name, name, user.ID, user.Username, "0", err, models.JSON{"action": "delete", "force": force})return fmt.Errorf("failed to connect to Docker: %w", err)}defer dockerClient.Close()if err := dockerClient.VolumeRemove(ctx, name, force); err != nil {+ s.eventService.LogErrorEvent(ctx, models.EventTypeVolumeError, "volume", name, name, user.ID, user.Username, "0", err, models.JSON{"action": "delete", "force": force})return fmt.Errorf("failed to remove volume: %w", err)}metadata := models.JSON{"action": "delete","name": name,- "force": force,}if logErr := s.eventService.LogVolumeEvent(ctx, models.EventTypeVolumeDelete, name, name, user.ID, user.Username, "0", metadata); logErr != nil {slog.WarnContext(ctx, "could not log volume deletion action",@@ -131,9 +135,6 @@ func (s *VolumeService) DeleteVolume(ctx context.Context, name string, force booslog.String("error", logErr.Error()))}- //- docker.InvalidateVolumeUsageCache()-return nil}