Skip to content

fix(network-agent): prevent out-of-CIDR IP allocation on CIDR change #378

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
woshihoujinxin wants to merge 1 commit into from
Closed

fix(network-agent): prevent out-of-CIDR IP allocation on CIDR change #378

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 6 additions & 1 deletion network-agent/cmd/network-agent/logging.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,14 @@ func initLoggerWithDir(logDir, logLevel string, rollNum, rollSizeMB int) error {
// Keep stdlib log flags empty so the message body isn't double-prefixed with timestamps.
stdlog.SetOutput(&cubeLogStdWriter{})
stdlog.SetFlags(0)
// Get LocalIP safely
localIP := "unknown"
if CubeLog.LocalIP != "" {
localIP = CubeLog.LocalIP
}
CubeLog.WithContext(context.Background()).Infof(
"network-agent logger initialized: module=%s version=%s localip=%s level=%s logpath=%s",
defaultModuleName, resolveVersion(), CubeLog.LocalIP, strings.ToUpper(logLevel), logDir,
defaultModuleName, resolveVersion(), localIP, strings.ToUpper(logLevel), logDir,
)
return nil
}
Expand Down
9 changes: 8 additions & 1 deletion network-agent/cmd/network-agent/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import (
"os"
"os/signal"
"reflect"
"runtime/debug"
"syscall"
"time"

Expand All @@ -25,6 +26,11 @@ import (
var newLocalService = service.NewLocalService

func main() {
defer func() {
if r := recover(); r != nil {
fmt.Fprintf(os.Stderr, "\n\n=== PANIC ===\n%v\n\n%s\n", r, debug.Stack())
}
}()
defaultCfg := service.DefaultConfig()
var (
listenEndpoint = flag.String("listen", "unix:///tmp/cube/network-agent.sock", "network-agent listen endpoint")
Expand Down Expand Up @@ -104,7 +110,8 @@ func main() {

svc, err := initService(cfg)
if err != nil {
CubeLog.Fatalf("network-agent init failed: %v", err)
fmt.Fprintf(os.Stderr, "\n\n=== ERROR: network-agent init failed ===\n%v\n\n", err)
os.Exit(1)
}
ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second)
defer cancel()
Expand Down
Loading
Loading