starred/headscale
1
0
Fork 0
mirror of https://github.com/juanfont/headscale.git synced 2026-04-23 09:08:44 +02:00
Code Issues 98 Packages Projects Releases 10 Wiki Activity

hscontrol/grpcv1: use EmbedObject and zf constants

Browse Source 
Replace manual field extraction with EmbedObject for node logging
in gRPC handlers. Use zf.* constants for consistent field naming.

Changes:
- RegisterNode: use EmbedObject(node), zf.RegistrationKey, etc.
- SetTags: use EmbedObject(node)
- ExpireNode: use EmbedObject(node), zf.ExpiresAt
- RenameNode: use EmbedObject(node), zf.NewName
- SetApprovedRoutes: use zf.NodeID
This commit is contained in:
Kristoffer Dalby
2026-02-05 11:01:41 +00:00
parent 4e73133b9f
commit 7148a690d0
1 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
hscontrol/grpcv1.go
View File

@@ -29,6 +29,7 @@ import (
"github.com/juanfont/headscale/hscontrol/state" "github.com/juanfont/headscale/hscontrol/state"
"github.com/juanfont/headscale/hscontrol/types" "github.com/juanfont/headscale/hscontrol/types"
"github.com/juanfont/headscale/hscontrol/util" "github.com/juanfont/headscale/hscontrol/util"
"github.com/juanfont/headscale/hscontrol/util/zlog/zf"
) )
type headscaleV1APIServer struct { // v1.HeadscaleServiceServer type headscaleV1APIServer struct { // v1.HeadscaleServiceServer
@@ -241,10 +242,10 @@ func (api headscaleV1APIServer) RegisterNode(
log.Trace(). log.Trace().
Caller(). Caller().
Str("user", request.GetUser()). Str(zf.UserName, request.GetUser()).
Str("registration_id", request.GetKey()). Str(zf.RegistrationID, request.GetKey()).
Str("registration_key", registrationKey). Str(zf.RegistrationKey, registrationKey).
Msg("Registering node") Msg("registering node")
registrationId, err := types.RegistrationIDFromString(request.GetKey()) registrationId, err := types.RegistrationIDFromString(request.GetKey())
if err != nil { if err != nil {
@@ -264,17 +265,16 @@ func (api headscaleV1APIServer) RegisterNode(
) )
if err != nil { if err != nil {
log.Error(). log.Error().
Str("registration_key", registrationKey). Str(zf.RegistrationKey, registrationKey).
Err(err). Err(err).
Msg("Failed to register node") Msg("failed to register node")
return nil, err return nil, err
} }
log.Info(). log.Info().
Str("registration_key", registrationKey). Str(zf.RegistrationKey, registrationKey).
Str("node_id", fmt.Sprintf("%d", node.ID())). EmbedObject(node).
Str("hostname", node.Hostname()). Msg("node registered successfully")
Msg("Node registered successfully")
// This is a bit of a back and forth, but we have a bit of a chicken and egg // This is a bit of a back and forth, but we have a bit of a chicken and egg
// dependency here. // dependency here.
@@ -355,9 +355,9 @@ func (api headscaleV1APIServer) SetTags(
log.Trace(). log.Trace().
Caller(). Caller().
Str("node", node.Hostname()). EmbedObject(node).
Strs("tags", request.GetTags()). Strs("tags", request.GetTags()).
Msg("Changing tags of node") Msg("changing tags of node")
return &v1.SetTagsResponse{Node: node.Proto()}, nil return &v1.SetTagsResponse{Node: node.Proto()}, nil
} }
@@ -368,7 +368,7 @@ func (api headscaleV1APIServer) SetApprovedRoutes(
) (*v1.SetApprovedRoutesResponse, error) { ) (*v1.SetApprovedRoutesResponse, error) {
log.Debug(). log.Debug().
Caller(). Caller().
Uint64("node.id", request.GetNodeId()). Uint64(zf.NodeID, request.GetNodeId()).
Strs("requestedRoutes", request.GetRoutes()). Strs("requestedRoutes", request.GetRoutes()).
Msg("gRPC SetApprovedRoutes called") Msg("gRPC SetApprovedRoutes called")
@@ -466,8 +466,8 @@ func (api headscaleV1APIServer) ExpireNode(
log.Trace(). log.Trace().
Caller(). Caller().
Str("node", node.Hostname()). EmbedObject(node).
Time("expiry", *node.AsStruct().Expiry). Time(zf.ExpiresAt, *node.AsStruct().Expiry).
Msg("node expired") Msg("node expired")
return &v1.ExpireNodeResponse{Node: node.Proto()}, nil return &v1.ExpireNodeResponse{Node: node.Proto()}, nil
@@ -487,8 +487,8 @@ func (api headscaleV1APIServer) RenameNode(
log.Trace(). log.Trace().
Caller(). Caller().
Str("node", node.Hostname()). EmbedObject(node).
Str("new_name", request.GetNewName()). Str(zf.NewName, request.GetNewName()).
Msg("node renamed") Msg("node renamed")
return &v1.RenameNodeResponse{Node: node.Proto()}, nil return &v1.RenameNodeResponse{Node: node.Proto()}, nil