fix: agent network not set to unix if addr provided by env var

This commit is contained in:
henrygd
2025-02-21 00:56:22 -05:00
parent baf56fe83b
commit b958e9eefe
2 changed files with 13 additions and 1 deletions

View File

@@ -117,6 +117,8 @@ func main() {
flag.Parse() flag.Parse()
opts.addr = opts.getAddress()
var serverConfig agent.ServerOptions var serverConfig agent.ServerOptions
var err error var err error
serverConfig.Keys, err = opts.loadPublicKeys() serverConfig.Keys, err = opts.loadPublicKeys()
@@ -124,7 +126,7 @@ func main() {
log.Fatal("Failed to load public keys:", err) log.Fatal("Failed to load public keys:", err)
} }
serverConfig.Addr = opts.getAddress() serverConfig.Addr = opts.addr
serverConfig.Network = opts.getNetwork() serverConfig.Network = opts.getNetwork()
agent := agent.NewAgent() agent := agent.NewAgent()

View File

@@ -54,6 +54,16 @@ func TestGetAddress(t *testing.T) {
}, },
expected: "7070", expected: "7070",
}, },
{
name: "use unix socket from env var",
opts: cmdOptions{
addr: "",
},
envVars: map[string]string{
"ADDR": "/tmp/beszel.sock",
},
expected: "/tmp/beszel.sock",
},
{ {
name: "flag takes precedence over env vars", name: "flag takes precedence over env vars",
opts: cmdOptions{ opts: cmdOptions{