From 329060e3ce1ee29634fd5a5fb8a009098838b101 Mon Sep 17 00:00:00 2001 From: Mykola Kobets Date: Mon, 28 Oct 2024 19:01:04 +0200 Subject: [PATCH 1/2] [vendor] Vendor update Signed-off-by: Mykola Kobets --- go.mod | 2 +- go.sum | 4 ++-- .../aosedge/aos_common/utils/iamclient/iamclient.go | 6 +++--- vendor/modules.txt | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/go.mod b/go.mod index bae5c231..7b2f2715 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,7 @@ replace github.com/coreos/go-iptables => github.com/aosedge/go-iptables v0.0.0-2 replace github.com/anexia-it/fsquota => github.com/aosedge/fsquota v0.0.0-20231127111317-842d831105a7 require ( - github.com/aosedge/aos_common v0.0.0-20241025075156-14720a7d701f + github.com/aosedge/aos_common v0.0.0-20241028191531-828ef3ba589e github.com/containernetworking/cni v1.1.2 github.com/containernetworking/plugins v1.3.0 github.com/coreos/go-iptables v0.6.0 diff --git a/go.sum b/go.sum index 643ae871..6d8f29e5 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,5 @@ -github.com/aosedge/aos_common v0.0.0-20241025075156-14720a7d701f h1:bQErAqQmCpJLZvvwnwtnIDXLafWc2CDXl74rc8HkwKM= -github.com/aosedge/aos_common v0.0.0-20241025075156-14720a7d701f/go.mod h1:8KL7yztgvArj3vpII9hnaAbebP4dP/7pox/vCLXW/cw= +github.com/aosedge/aos_common v0.0.0-20241028191531-828ef3ba589e h1:uoqg7RNc7+eNbDPeWungkQ1/bekBj0YXdB9rqMbmXm8= +github.com/aosedge/aos_common v0.0.0-20241028191531-828ef3ba589e/go.mod h1:8KL7yztgvArj3vpII9hnaAbebP4dP/7pox/vCLXW/cw= github.com/aosedge/crypto11 v1.0.3-0.20220217163524-ddd0ace39e6f h1:xL5hA9axQFHnoVVF/Q8CkKl9JiTvA7U72jRDltMBB9M= github.com/aosedge/crypto11 v1.0.3-0.20220217163524-ddd0ace39e6f/go.mod h1:ILDKtnCKiQ7zRoNxcp36Y1ZR8LBPmR2E23+wTQe/MlE= github.com/aosedge/fsquota v0.0.0-20231127111317-842d831105a7 h1:KR+SuYXJ9HigUaJdUwRlkDOOpkCrliFF3liBVKu2GKY= diff --git a/vendor/github.com/aosedge/aos_common/utils/iamclient/iamclient.go b/vendor/github.com/aosedge/aos_common/utils/iamclient/iamclient.go index 94cf0689..87a57eb2 100644 --- a/vendor/github.com/aosedge/aos_common/utils/iamclient/iamclient.go +++ b/vendor/github.com/aosedge/aos_common/utils/iamclient/iamclient.go @@ -958,7 +958,7 @@ func (client *Client) processNodeInfoChange(sub *nodeInfoChangeSub) { for { nodeInfo, err := (*sub.grpcStream).Recv() if err != nil { - log.WithField("err", err).Error("Process NodeInfo change failed") + log.WithField("err", err).Warning("Process NodeInfo change failed") client.onConnectionLost() @@ -979,7 +979,7 @@ func (client *Client) processUnitSubjectsChange(sub *subjectsChangeSub) { for { subjects, err := (*sub.grpcStream).Recv() if err != nil { - log.WithField("err", err).Error("Process UnitSubjects change failed") + log.WithField("err", err).Warning("Process UnitSubjects change failed") client.onConnectionLost() @@ -1002,7 +1002,7 @@ func (client *Client) processCertInfoChange(sub *certChangeSub) { for { cert, err := (*sub.grpcStream).Recv() if err != nil { - log.WithField("err", err).Error("Process CertInfo change failed") + log.WithField("err", err).Warning("Process CertInfo change failed") client.onConnectionLost() diff --git a/vendor/modules.txt b/vendor/modules.txt index 918004e3..bd45747e 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -4,7 +4,7 @@ github.com/ThalesIgnite/crypto11 # github.com/anexia-it/fsquota v0.0.0-00010101000000-000000000000 => github.com/aosedge/fsquota v0.0.0-20231127111317-842d831105a7 ## explicit; go 1.21 github.com/anexia-it/fsquota -# github.com/aosedge/aos_common v0.0.0-20241025075156-14720a7d701f +# github.com/aosedge/aos_common v0.0.0-20241028191531-828ef3ba589e ## explicit; go 1.21 github.com/aosedge/aos_common/aoserrors github.com/aosedge/aos_common/aostypes From 9839050005310a1b6294a70d52d49407b3703e3d Mon Sep 17 00:00:00 2001 From: Mykola Kobets Date: Mon, 28 Oct 2024 21:01:01 +0200 Subject: [PATCH 2/2] [smclient] Change log.Error to Warning to fix alerts after reboot Signed-off-by: Mykola Kobets --- smclient/smclient.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/smclient/smclient.go b/smclient/smclient.go index a7294043..b39be32c 100644 --- a/smclient/smclient.go +++ b/smclient/smclient.go @@ -233,7 +233,7 @@ func (client *SMClient) createConnection( if errors.Is(err, io.EOF) { log.Debug("Connection is closed") } else { - log.Errorf("Connection error: %v", aoserrors.Wrap(err)) + log.Warningf("Connection error: %v", aoserrors.Wrap(err)) } }