PNArchives/Memoh
1
0
Fork 0
mirror of https://github.com/memohai/Memoh.git synced 2026-04-27 07:16:19 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'v0.4'

Browse Source
This commit is contained in:
Acbox
2026-03-07 18:19:51 +08:00
parent abbb14c59f dae772f729
commit e554186ca9
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/mcp/versioning.go
+8 -7
View File
@@ -5,7 +5,6 @@ import (
"encoding/json"
"errors"
"fmt"
"log/slog"
"math"
"strings"
"time"
@@ -392,16 +391,18 @@ func (m *Manager) replaceContainerSnapshot(ctx context.Context, botID, container
// unconditionally so the next call dials fresh to the new process.
m.grpcPool.Remove(botID)
if netResult, err := m.service.SetupNetwork(ctx, ctr.NetworkSetupRequest{
netResult, err := m.service.SetupNetwork(ctx, ctr.NetworkSetupRequest{
ContainerID: containerID,
CNIBinDir: m.cfg.CNIBinaryDir,
CNIConfDir: m.cfg.CNIConfigDir,
}); err != nil {
m.logger.Warn("network setup failed after snapshot replace",
slog.String("container_id", containerID), slog.Any("error", err))
} else {
m.SetContainerIP(botID, netResult.IP)
})
if err != nil {
return fmt.Errorf("network setup after snapshot replace: %w", err)
}
if netResult.IP == "" {
return fmt.Errorf("network setup returned no IP after snapshot replace for %s", containerID)
}
m.SetContainerIP(botID, netResult.IP)
return nil
}