Commit a6e9c58

author

Sandy

authored

Merge pull request #161 from openset/develop

Update: client

2 parents 7722a92 + 17640a3 commit a6e9c58Copy full SHA for a6e9c58

File tree

+19

-15

lines changed

+19

-15

lines changed

Lines changed: 5 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -53,9 +53,11 @@ func Usage() {`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`func FilePutContents(filename string, data []byte) []byte {`
`56`		`- filename = getFilePath(filename)`
`57`		`- err := ioutil.WriteFile(filename, data, 0644)`
`58`		`- CheckErr(err)`
	`56`	`+ if len(data) > 0 {`
	`57`	`+ filename = getFilePath(filename)`
	`58`	`+ err := ioutil.WriteFile(filename, data, 0644)`
	`59`	`+ CheckErr(err)`
	`60`	`+ }`
`59`	`61`	`return data`
`60`	`62`	`}`
`61`	`63`

Lines changed: 14 additions & 12 deletions

Original file line number	Diff line number	Diff line change
`@@ -25,19 +25,21 @@ func init() {`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`func Get(url string) []byte {`
`28`		`- resp, err := http.Get(url)`
`29`		`- base.CheckErr(err)`
`30`		`- defer resp.Body.Close()`
`31`		`- body, err := ioutil.ReadAll(resp.Body)`
`32`		`- base.CheckErr(err)`
`33`		`- return body`
	`28`	`+ if resp, err := http.Get(url); err == nil {`
	`29`	`+ defer resp.Body.Close()`
	`30`	`+ body, err := ioutil.ReadAll(resp.Body)`
	`31`	`+ base.CheckErr(err)`
	`32`	`+ return body`
	`33`	`+ }`
	`34`	`+ return nil`
`34`	`35`	`}`
`35`	`36`
`36`	`37`	`func PostJson(url, jsonStr string) []byte {`
`37`		`- resp, err := http.Post(url, "application/json", strings.NewReader(jsonStr))`
`38`		`- base.CheckErr(err)`
`39`		`- defer resp.Body.Close()`
`40`		`- body, err := ioutil.ReadAll(resp.Body)`
`41`		`- base.CheckErr(err)`
`42`		`- return body`
	`38`	`+ if resp, err := http.Post(url, "application/json", strings.NewReader(jsonStr)); err == nil {`
	`39`	`+ defer resp.Body.Close()`
	`40`	`+ body, err := ioutil.ReadAll(resp.Body)`
	`41`	`+ base.CheckErr(err)`
	`42`	`+ return body`
	`43`	`+ }`
	`44`	`+ return nil`
`43`	`45`	`}`

Comments

(0)