CalvinBackup/ctrld
1
0
Fork 0
mirror of https://github.com/Control-D-Inc/ctrld.git synced 2026-02-03 22:18:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

all: change send log to use x-www-form-urlencoded

Browse Source
This commit is contained in:
Cuong Manh Le
2025-01-07 16:56:09 +07:00
committed by Cuong Manh Le
parent 5a566c028a
commit a5c776c846
3 changed files with 54 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
internal/controld/config.go
View File

@@ -77,8 +77,8 @@ type UtilityOrgRequest struct {
// LogsRequest contains request data for sending runtime logs to API.
type LogsRequest struct {
UID string `json:"uid"`
LogFile string `json:"log_file"`
UID string `json:"uid"`
Data io.ReadCloser `json:"-"`
}
// FetchResolverConfig fetch Control D config for given uid.
@@ -160,20 +160,20 @@ func postUtilityAPI(version string, cdDev, lastUpdatedFailed bool, body io.Reade
}
// SendLogs sends runtime log to ControlD API.
func SendLogs(req *LogsRequest, cdDev bool) error {
body, _ := json.Marshal(req)
return postLogAPI(cdDev, bytes.NewReader(body))
}
func postLogAPI(cdDev bool, body io.Reader) error {
func SendLogs(lr *LogsRequest, cdDev bool) error {
defer lr.Data.Close()
apiUrl := logURLCom
if cdDev {
apiUrl = logURLDev
}
req, err := http.NewRequest("POST", apiUrl, body)
req, err := http.NewRequest("POST", apiUrl, lr.Data)
if err != nil {
return fmt.Errorf("http.NewRequest: %w", err)
}
q := req.URL.Query()
q.Set("uid", lr.UID)
req.URL.RawQuery = q.Encode()
req.Header.Add("Content-Type", "application/x-www-form-urlencoded")
transport := apiTransport(cdDev)
client := http.Client{
Timeout: 10 * time.Second,
@@ -181,7 +181,7 @@ func postLogAPI(cdDev bool, body io.Reader) error {
}
resp, err := client.Do(req)
if err != nil {
return fmt.Errorf("postLogAPI client.Do: %w", err)
return fmt.Errorf("SendLogs client.Do: %w", err)
}
defer resp.Body.Close()
d := json.NewDecoder(resp.Body)