Skip to content

Improve algons error logging #733

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
tsachiherman merged 2 commits into from
Jan 22, 2020
Merged

Improve algons error logging #733

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
16833d0
Write body when erroring on SRV/DNS records update.
tsachizehub Jan 22, 2020
e910772
Few more error messages.
tsachizehub Jan 22, 2020
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
2 changes: 1 addition & 1 deletion cmd/algons/dnsCmd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ func doAddDNS(from string, to string) (err error) {
} else {
recordType = "CNAME"
}
cloudflareDNS.SetDNSRecord(context.Background(), recordType, from, to, cloudflare.AutomaticTTL, priority, proxied)
err = cloudflareDNS.SetDNSRecord(context.Background(), recordType, from, to, cloudflare.AutomaticTTL, priority, proxied)

return
}
Expand Down
32 changes: 26 additions & 6 deletions tools/network/cloudflare/cloudflare.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,10 @@ func (d *DNS) CreateDNSRecord(ctx context.Context, recordType string, name strin
return err
}
if parsedResponse.Success == false {
return fmt.Errorf("failed to create DNS record : %v", parsedResponse)
request, _ := createDNSRecordRequest(d.zoneID, d.authEmail, d.authKey, recordType, name, content, ttl, priority, proxied)
requestBody, _ := request.GetBody()
bodyBytes, _ := ioutil.ReadAll(requestBody)
return fmt.Errorf("failed to create DNS record. Request body = %s, parsed response : %#v", string(bodyBytes), parsedResponse)
}
return nil
}
Expand All @@ -193,7 +196,10 @@ func (d *DNS) CreateSRVRecord(ctx context.Context, name string, target string, t
return err
}
if parsedResponse.Success == false {
return fmt.Errorf("failed to create SRV record : %v", parsedResponse)
request, _ := createSRVRecordRequest(d.zoneID, d.authEmail, d.authKey, name, service, protocol, weight, port, ttl, priority, target)
requestBody, _ := request.GetBody()
bodyBytes, _ := ioutil.ReadAll(requestBody)
return fmt.Errorf("failed to create SRV record. Request body = %s, parsed response : %#v", string(bodyBytes), parsedResponse)
}
return nil
}
Expand All @@ -215,7 +221,10 @@ func (d *DNS) DeleteDNSRecord(ctx context.Context, recordID string) error {
return err
}
if parsedResponse.Success == false {
return fmt.Errorf("failed to delete DNS record : %v", parsedResponse)
request, _ := deleteDNSRecordRequest(d.zoneID, d.authEmail, d.authKey, recordID)
requestBody, _ := request.GetBody()
bodyBytes, _ := ioutil.ReadAll(requestBody)
return fmt.Errorf("failed to delete DNS record. Request body = %s, parsed response : %#v", string(bodyBytes), parsedResponse)
}
return nil
}
Expand All @@ -236,9 +245,14 @@ func (d *DNS) UpdateDNSRecord(ctx context.Context, recordID string, recordType s
if err != nil {
return err
}

if parsedResponse.Success == false {
return fmt.Errorf("failed to update DNS record : %v", parsedResponse)
request, _ := updateDNSRecordRequest(d.zoneID, d.authEmail, d.authKey, recordType, recordID, name, content, ttl, priority, proxied)
requestBody, _ := request.GetBody()
bodyBytes, _ := ioutil.ReadAll(requestBody)
return fmt.Errorf("failed to update DNS record. Request body = %s, parsedResponse = %#v", string(bodyBytes), parsedResponse)
}

return nil
}

Expand All @@ -259,7 +273,10 @@ func (d *DNS) UpdateSRVRecord(ctx context.Context, recordID string, name string,
return err
}
if parsedResponse.Success == false {
return fmt.Errorf("failed to update SRV record : %v", parsedResponse)
request, _ := updateSRVRecordRequest(d.zoneID, d.authEmail, d.authKey, recordID, name, service, protocol, weight, port, ttl, priority, target)
requestBody, _ := request.GetBody()
bodyBytes, _ := ioutil.ReadAll(requestBody)
return fmt.Errorf("failed to update SRV record. Request body = %s, parsedResponse = %#v", string(bodyBytes), parsedResponse)
}
return nil
}
Expand Down Expand Up @@ -287,7 +304,10 @@ func (c *Cred) GetZones(ctx context.Context) (zones []Zone, err error) {
return nil, err
}
if parsedResponse.Success == false {
return nil, fmt.Errorf("failed to retrieve zone records : %v", parsedResponse)
request, _ := getZonesRequest(c.authEmail, c.authKey)
requestBody, _ := request.GetBody()
bodyBytes, _ := ioutil.ReadAll(requestBody)
return nil, fmt.Errorf("failed to retrieve zone records. Request body = %s, parsed response : %#v", string(bodyBytes), parsedResponse)
}

for _, z := range parsedResponse.Result {
Expand Down