Changeset 4 in code for trunk

Timestamp:

Oct 17, 2016, 11:26:20 PM (9 years ago)

Author:

asciimoo

Message:

[enh] add request timeout

File:

• trunk/morty.go (modified) (6 diffs)

trunk/morty.go

@@ -15 +15 @@
         "regexp"
         "strings"
+        "time"
 
         "github.com/valyala/fasthttp"
@@ -95 +96 @@
 
 type Proxy struct {
-        Key []byte
+        Key            []byte
+        RequestTimeout time.Duration
 }
 
@@ -112 +114 @@
 </div>
 <style>
-#mortyheader { position: fixed; top: 15%%; left: 0; max-width: 10em; color: #444; overflow: hidden; z-index: 1000; }
+#mortyheader { position: fixed; top: 15%%; left: 0; max-width: 10em; color: #444; overflow: hidden; z-index: 110000; }
 #mortyheader a { color: #3498db; }
 #mortyheader div { padding: 8px; font-size: 0.9em; border-width: 4px 4px 4px 0; border-style: solid; border-color: #3498db; background: #FFF; }
@@ -169 +171 @@
         }
 
-        if p.breakOnError(ctx, CLIENT.Do(req, resp)) {
+        if p.breakOnError(ctx, CLIENT.DoTimeout(req, resp, p.RequestTimeout)) {
                 return
         }
@@ -516 +518 @@
                 return false
         }
+        log.Println("error:", err)
         ctx.SetStatusCode(404)
         ctx.SetContentType("text/html")
@@ -543 +546 @@
         listen := flag.String("listen", "127.0.0.1:3000", "Listen address")
         key := flag.String("key", "", "HMAC url validation key (hexadecimal encoded) - leave blank to disable")
+        requestTimeout := flag.Uint("timeout", 2, "Request timeout")
         flag.Parse()
 
-        p := &Proxy{}
+        p := &Proxy{RequestTimeout: time.Duration(*requestTimeout) * time.Second}
 
         if *key != "" {