Skip to content

Commit a2a1772

Browse files
authored
Merge pull request #285 from TheThingsNetwork/fix/ns-log
Lower severity of non-critical logging statements
2 parents 4a1d4fb + 7b118b5 commit a2a1772

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed

pkg/networkserver/downlink.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ outer:
222222
}
223223
key, err := cryptoutil.UnwrapAES128Key(*dev.Session.NwkSEncKey, ns.KeyVault)
224224
if err != nil {
225-
logger.WithField("kek_label", dev.Session.NwkSEncKey.KEKLabel).WithError(err).Error("Failed to unwrap NwkSEncKey")
225+
logger.WithField("kek_label", dev.Session.NwkSEncKey.KEKLabel).WithError(err).Warn("Failed to unwrap NwkSEncKey")
226226
return nil, nil, err
227227
}
228228

@@ -278,7 +278,7 @@ outer:
278278
}
279279
key, err := cryptoutil.UnwrapAES128Key(*dev.Session.SNwkSIntKey, ns.KeyVault)
280280
if err != nil {
281-
logger.WithField("kek_label", dev.Session.SNwkSIntKey.KEKLabel).WithError(err).Error("Failed to unwrap SNwkSIntKey")
281+
logger.WithField("kek_label", dev.Session.SNwkSIntKey.KEKLabel).WithError(err).Warn("Failed to unwrap SNwkSIntKey")
282282
return nil, nil, err
283283
}
284284

@@ -844,7 +844,7 @@ func (ns *NetworkServer) processDownlinkTask(ctx context.Context) error {
844844

845845
case err != nil:
846846
setErr = true
847-
logger.WithError(err).Error("Failed to update device in registry")
847+
logger.WithError(err).Warn("Failed to update device in registry")
848848
return err
849849
}
850850

@@ -859,7 +859,7 @@ func (ns *NetworkServer) processDownlinkTask(ctx context.Context) error {
859859
return nil
860860
})
861861
if err != nil && !setErr && !addErr && !scheduleErr {
862-
ns.Logger().WithError(err).Error("Failed to pop device from downlink schedule")
862+
ns.Logger().WithError(err).Warn("Failed to pop device from downlink schedule")
863863
}
864864
return err
865865
}

pkg/networkserver/grpc_gsns.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@ outer:
281281

282282
fNwkSIntKey, err := cryptoutil.UnwrapAES128Key(*dev.matchedSession.FNwkSIntKey, ns.KeyVault)
283283
if err != nil {
284-
logger.WithField("kek_label", dev.matchedSession.FNwkSIntKey.KEKLabel).WithError(err).Error("Failed to unwrap FNwkSIntKey, skipping...")
284+
logger.WithField("kek_label", dev.matchedSession.FNwkSIntKey.KEKLabel).WithError(err).Warn("Failed to unwrap FNwkSIntKey, skipping...")
285285
continue
286286
}
287287

@@ -301,7 +301,7 @@ outer:
301301

302302
sNwkSIntKey, err := cryptoutil.UnwrapAES128Key(*dev.matchedSession.SNwkSIntKey, ns.KeyVault)
303303
if err != nil {
304-
logger.WithField("kek_label", dev.matchedSession.SNwkSIntKey.KEKLabel).WithError(err).Error("Failed to unwrap SNwkSIntKey, skipping...")
304+
logger.WithField("kek_label", dev.matchedSession.SNwkSIntKey.KEKLabel).WithError(err).Warn("Failed to unwrap SNwkSIntKey, skipping...")
305305
continue
306306
}
307307

@@ -423,7 +423,7 @@ func (ns *NetworkServer) handleUplink(ctx context.Context, up *ttnpb.UplinkMessa
423423
}
424424
key, err := cryptoutil.UnwrapAES128Key(*ses.NwkSEncKey, ns.KeyVault)
425425
if err != nil {
426-
logger.WithField("kek_label", ses.NwkSEncKey.KEKLabel).WithError(err).Error("Failed to unwrap NwkSEncKey")
426+
logger.WithField("kek_label", ses.NwkSEncKey.KEKLabel).WithError(err).Warn("Failed to unwrap NwkSEncKey")
427427
return err
428428
}
429429

@@ -700,7 +700,7 @@ func (ns *NetworkServer) handleUplink(ctx context.Context, up *ttnpb.UplinkMessa
700700
return stored, paths, nil
701701
})
702702
if err != nil && !handleErr {
703-
logger.WithError(err).Error("Failed to update device in registry")
703+
logger.WithError(err).Warn("Failed to update device in registry")
704704
// TODO: Retry transaction. (https://github.com/TheThingsNetwork/lorawan-stack/issues/33)
705705
registerDropDataUplink(ctx, &matched.EndDeviceIdentifiers, up, err)
706706
}
@@ -769,7 +769,7 @@ func (ns *NetworkServer) handleJoin(ctx context.Context, up *ttnpb.UplinkMessage
769769
)
770770
if err != nil {
771771
registerDropJoinRequest(ctx, nil, up, err)
772-
logger.WithError(err).Error("Failed to load device from registry")
772+
logger.WithError(err).Warn("Failed to load device from registry")
773773
return err
774774
}
775775

@@ -790,7 +790,7 @@ func (ns *NetworkServer) handleJoin(ctx context.Context, up *ttnpb.UplinkMessage
790790
ctx = log.NewContext(ctx, logger)
791791

792792
if err := resetMACState(dev, ns.FrequencyPlans, ns.defaultMACSettings); err != nil {
793-
logger.WithError(err).Error("Failed to reset device's MAC state")
793+
logger.WithError(err).Warn("Failed to reset device's MAC state")
794794
return err
795795
}
796796

@@ -901,7 +901,7 @@ func (ns *NetworkServer) handleJoin(ctx context.Context, up *ttnpb.UplinkMessage
901901
return stored, paths, nil
902902
})
903903
if err != nil && !resetErr {
904-
logger.WithError(err).Error("Failed to update device in registry")
904+
logger.WithError(err).Warn("Failed to update device in registry")
905905
// TODO: Retry transaction. (https://github.com/TheThingsNetwork/lorawan-stack/issues/33)
906906
}
907907
if err != nil {
@@ -1003,7 +1003,7 @@ func (ns *NetworkServer) HandleUplink(ctx context.Context, up *ttnpb.UplinkMessa
10031003
logger.Debug("Handling rejoin-request...")
10041004
return ttnpb.Empty, ns.handleRejoin(ctx, up, acc)
10051005
default:
1006-
logger.Error("Unmatched MType")
1006+
logger.Warn("Unmatched MType")
10071007
return ttnpb.Empty, nil
10081008
}
10091009
}

0 commit comments

Comments
 (0)