Skip to content

Commit e4a6b38

Browse files
authored
chore: rename log package in order to avoid conflict (#305)
1 parent 6795ec7 commit e4a6b38

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

pkg/cover/instrument.go

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ import (
5050
"fmt"
5151
"io"
5252
"io/ioutil"
53-
"log"
53+
_log "log"
5454
"net"
5555
"net/http"
5656
"os"
@@ -137,12 +137,12 @@ func registerHandlers() {
137137
ln, host, err := listen()
138138
{{end}}
139139
if err != nil {
140-
log.Fatalf("listen failed, err:%v", err)
140+
_log.Fatalf("listen failed, err:%v", err)
141141
}
142142
{{if not .Singleton}}
143143
profileAddr := "http://" + host
144144
if resp, err := registerSelf(profileAddr); err != nil {
145-
log.Fatalf("register address %v failed, err: %v, response: %v", profileAddr, err, string(resp))
145+
_log.Fatalf("register address %v failed, err: %v, response: %v", profileAddr, err, string(resp))
146146
}
147147
148148
fn := func() {
@@ -152,7 +152,7 @@ func registerHandlers() {
152152
addresses []string
153153
)
154154
if addresses, err = getAllHosts(ln); err != nil {
155-
log.Fatalf("get all host failed, err: %v", err)
155+
_log.Fatalf("get all host failed, err: %v", err)
156156
return
157157
}
158158
for _, addr := range addresses {
@@ -218,7 +218,7 @@ func registerHandlers() {
218218
fmt.Fprintln(w, "clear call successfully")
219219
})
220220
221-
log.Fatal(http.Serve(ln, mux))
221+
_log.Fatal(http.Serve(ln, mux))
222222
}
223223
224224
func registerSelf(address string) ([]byte, error) {
@@ -231,13 +231,13 @@ func registerSelf(address string) ([]byte, error) {
231231
}
232232
req, err := http.NewRequest("POST", fmt.Sprintf("%s/v1/cover/register?name=%s&address=%s", {{.Center | printf "%q"}}, selfName, address), nil)
233233
if err != nil {
234-
log.Fatalf("http.NewRequest failed: %v", err)
234+
_log.Fatalf("http.NewRequest failed: %v", err)
235235
return nil, err
236236
}
237237
238238
resp, err := http.DefaultClient.Do(req)
239239
if err != nil && isNetworkError(err) {
240-
log.Printf("[goc][WARN]error occurred:%v, try again", err)
240+
_log.Printf("[goc][WARN]error occurred:%v, try again", err)
241241
resp, err = http.DefaultClient.Do(req)
242242
}
243243
if err != nil {
@@ -267,14 +267,14 @@ func deregisterSelf(address []string) ([]byte, error) {
267267
}
268268
req, err := http.NewRequest("POST", fmt.Sprintf("%s/v1/cover/remove", {{.Center | printf "%q"}}), bytes.NewReader(jsonBody))
269269
if err != nil {
270-
log.Fatalf("http.NewRequest failed: %v", err)
270+
_log.Fatalf("http.NewRequest failed: %v", err)
271271
return nil, err
272272
}
273273
req.Header.Set("Content-Type", "application/json")
274274
275275
resp, err := http.DefaultClient.Do(req)
276276
if err != nil && isNetworkError(err) {
277-
log.Printf("[goc][WARN]error occurred:%v, try again", err)
277+
_log.Printf("[goc][WARN]error occurred:%v, try again", err)
278278
resp, err = http.DefaultClient.Do(req)
279279
}
280280
if err != nil {
@@ -302,7 +302,7 @@ func watchSignal(fn CallbackFunc) {
302302
signal.Notify(c, syscall.SIGHUP, syscall.SIGQUIT, syscall.SIGTERM, syscall.SIGINT)
303303
for {
304304
si := <-c
305-
log.Printf("get a signal %s", si.String())
305+
_log.Printf("get a signal %s", si.String())
306306
switch si {
307307
case syscall.SIGQUIT, syscall.SIGTERM, syscall.SIGINT:
308308
fn()
@@ -411,7 +411,7 @@ func genProfileAddr(profileAddr string) {
411411
fn := os.Args[0] + "_profile_listen_addr"
412412
f, err := os.OpenFile(fn, os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0644)
413413
if err != nil {
414-
log.Println(err)
414+
_log.Println(err)
415415
return
416416
}
417417
defer f.Close()

0 commit comments

Comments
 (0)