removed crazy logging
Henry committed
Mar 4, 2015 at 16:18 UTC
3f932af14dcebb0b902816e07a7fc65904286cfe
1 file changed
+23
-36
cmd/pollEndpoint/main.go
+23
-36
@@ -3,11 +3,10 @@ package main
3
4
import (
5
"flag"
6
- "net"
6
+ "fmt"
7
"net/http"
8
"net/url"
9
"os"
10
- "syscall"
10
"time"
11
12
log "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/Sirupsen/logrus"
@@ -33,7 +32,7 @@ func main() {
32
}
33
p := addr.Protocols()
34
if len(p) < 2 {
36
- log.WithField("addr", addr).Fatal("need to protocolls in host flag.")
35
+ log.WithField("addr", addr).Fatal("need two protocols in host flag (/ip/tcp)")
36
}
37
_, host, err := manet.DialArgs(addr)
38
if err != nil {
@@ -60,43 +59,16 @@ func main() {
59
}).Debug("starting")
60
61
for *tries > 0 {
63
-
62
f := log.Fields{"tries": *tries}
63
66
- resp, err := http.Get(u.String())
67
-
64
+ err := checkOK(http.Get(u.String()))
65
if err == nil {
69
- resp.Body.Close()
70
-
71
- if resp.StatusCode == http.StatusOK {
72
- f["took"] = time.Since(start)
73
- log.WithFields(f).Println("status ok - endpoint reachable")
74
- os.Exit(0)
75
- }
76
-
77
- f["status"] = resp.Status
78
- log.WithFields(f).Warn("response not okay")
79
-
80
- } else if urlErr, ok := err.(*url.Error); ok { // expected error from http.Get()
81
- f["urlErr"] = urlErr
82
-
83
- if urlErr.Op != "Get" || urlErr.URL != *endpoint {
84
- f["op"] = urlErr.Op
85
- f["url"] = urlErr.URL
86
- log.WithFields(f).Error("way to funky buisness..!")
87
- }
88
-
89
- if opErr, ok := urlErr.Err.(*net.OpError); ok {
90
- f["opErr"] = opErr
91
- f["connRefused"] = opErr.Err == syscall.ECONNREFUSED
92
- f["temporary"] = opErr.Temporary()
93
- log.WithFields(f).Println("net.OpError")
94
- }
95
- } else { // unexpected error from http.Get()
96
- f["err"] = err
97
- log.WithFields(f).Error("unknown error")
66
+ f["took"] = time.Since(start)
67
+ log.WithFields(f).Println("status ok - endpoint reachable")
68
+ os.Exit(0)
69
}
99
-
70
+ f["error"] = err
71
+ log.WithFields(f).Debug("get failed")
72
time.Sleep(*timeout)
73
*tries--
74
}
@@ -104,3 +76,18 @@ func main() {
76
log.Println("failed.")
77
os.Exit(1)
78
}
79
+
80
+func checkOK(resp *http.Response, err error) error {
81
+ if err == nil { // request worked
82
+ resp.Body.Close()
83
+ if resp.StatusCode == http.StatusOK {
84
+ return nil
85
+ }
86
+ return fmt.Errorf("Response not OK. %d %s", resp.StatusCode, resp.Status)
87
+ } else if urlErr, ok := err.(*url.Error); ok { // expected error from http.Get()
88
+ if urlErr.Op != "Get" || urlErr.URL != *endpoint {
89
+ return fmt.Errorf("wrong url or endpoint error from http.Get() %#v", urlErr)
90
+ }
91
+ }
92
+ return err
93
+}