Skip to content

fix: unblock channel for cni #1667

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

Merged
merged 2 commits into from
Oct 24, 2022
+1 −7
Merged

fix: unblock channel for cni #1667

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e9c3788
implement select case
camrynl Oct 20, 2022
b86e94c
remove calls to tb.cancel() in telemetry.go
camrynl Oct 20, 2022
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
8 changes: 1 addition & 7 deletions telemetry/telemetry.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,10 +111,8 @@ func (reportMgr *ReportManager) SendReport(tb *TelemetryBuffer) error {
if tb != nil && tb.Connected {
report, err = reportMgr.ReportToBytes()
if err == nil {
// If write fails, try to re-establish connections as server/client
if _, err = tb.Write(report); err != nil {
log.Printf("telemetry write failed:%v", err)
tb.Cancel()
}
}
}
Expand All @@ -124,7 +122,6 @@ func (reportMgr *ReportManager) SendReport(tb *TelemetryBuffer) error {

// ReportToBytes - returns the report bytes
func (reportMgr *ReportManager) ReportToBytes() ([]byte, error) {

switch reportMgr.Report.(type) {
case *CNIReport:
case *AIMetric:
Expand All @@ -145,9 +142,8 @@ func SendCNIMetric(cniMetric *AIMetric, tb *TelemetryBuffer) error {
reportMgr := &ReportManager{Report: cniMetric}
report, err = reportMgr.ReportToBytes()
if err == nil {
// If write fails, try to re-establish connections as server/client
if _, err = tb.Write(report); err != nil {
tb.Cancel()
log.Printf("Error writing to telemetry socket:%v", err)
}
}
}
Expand All @@ -160,10 +156,8 @@ func SendCNIEvent(tb *TelemetryBuffer, report *CNIReport) {
reportMgr := &ReportManager{Report: report}
reportBytes, err := reportMgr.ReportToBytes()
if err == nil {
// If write fails, try to re-establish connections as server/client
if _, err = tb.Write(reportBytes); err != nil {
log.Printf("Error writing to telemetry socket:%v", err)
tb.Cancel()
}
}
}
Expand Down