Changeset 97 in code for trunk

Timestamp:

Oct 15, 2019, 7:56:30 AM (6 years ago)

Author:

mathieu.brunot

Message:

:sparkles: Var to enable/disable debug logs

Signed-off-by: mathieu.brunot <mathieu.brunot@…>

Location:

trunk

Files:

• Dockerfile (modified) (1 diff)
• morty.go (modified) (9 diffs)

trunk/Dockerfile

@@ -26 +26 @@
 USER morty
 
+ENV DEBUG=true
+
 ENTRYPOINT ["/usr/local/morty/morty"]

trunk/morty.go

@@ -37 +37 @@
 const VERSION = "v0.2.0"
 
-const MAX_REDIRECT_COUNT = 5
+var DEBUG = os.Getenv("DEBUG")
+if DEBUG == "true" {
+        DEBUG = true
+} else {
+        DEBUG = false
+}
 
 var CLIENT *fasthttp.Client = &fasthttp.Client{
@@ -290 +295 @@
         }
 
-        p.ProcessUri(ctx, string(requestURI), 0)
-}
-
-func (p *Proxy) ProcessUri(ctx *fasthttp.RequestCtx, requestURI string, redirectCount int) {
-        parsedURI, err := url.Parse(requestURI)
+        parsedURI, err := url.Parse(string(requestURI))
 
         if err != nil {
@@ -314 +315 @@
         requestURIStr := string(requestURI)
 
-        log.Println("getting", requestURIStr)
+        if DEBUG {
+                log.Println("getting", requestURIStr)
+        }
 
         req.SetRequestURI(requestURIStr)
@@ -345 +348 @@
                         loc := resp.Header.Peek("Location")
                         if loc != nil {
-                                log.Println("redirect to", string(loc))
-                                if ctx.IsGet() {
-                                        // GET method: Morty follows the redirect
-                                        if redirectCount < MAX_REDIRECT_COUNT {
-                                                p.ProcessUri(ctx, string(loc), redirectCount+1)
-                                        } else {
-                                                p.serveMainPage(ctx, 310, errors.New("Too many redirects"))
+                                rc := &RequestConfig{Key: p.Key, BaseURL: parsedURI}
+                                url, err := rc.ProxifyURI(loc)
+                                if err == nil {
+                                        ctx.SetStatusCode(resp.StatusCode())
+                                        ctx.Response.Header.Add("Location", url)
+                                        if DEBUG {
+                                                log.Println("redirect to", string(loc))
                                         }
                                         return
-                                } else {
-                                        // Other HTTP methods: Morty does NOT follow the redirect
-                                        rc := &RequestConfig{Key: p.Key, BaseURL: parsedURI}
-                                        url, err := rc.ProxifyURI(loc)
-                                        if err == nil {
-                                                ctx.SetStatusCode(resp.StatusCode())
-                                                ctx.Response.Header.Add("Location", url)
-                                                return
-                                        }
                                 }
                         }
@@ -530 +524 @@
                         out.Write([]byte(uri))
                         startIndex = urlEnd
-                } else {
+                } else if DEBUG {
                         log.Println("cannot proxify css uri:", string(css[urlStart:urlEnd]))
                 }
@@ -551 +545 @@
                         err := decoder.Err()
                         if err != io.EOF {
-                                log.Println("failed to parse HTML:")
+                                log.Println("failed to parse HTML")
                         }
                         break
@@ -793 +787 @@
                 if uri, err := rc.ProxifyURI(attrValue); err == nil {
                         fmt.Fprintf(out, " %s=\"%s\"", attrName, uri)
-                } else {
+                } else if DEBUG {
                         log.Println("cannot proxify uri:", string(attrValue))
                 }
@@ -943 +937 @@
         _, err := hex.Decode(h, hashMsg)
         if err != nil {
-                log.Println("hmac error:", err)
+                if DEBUG {
+                        log.Println("hmac error:", err)
+                }
                 return false
         }
@@ -969 +965 @@
         ctx.Write([]byte(MORTY_HTML_PAGE_START))
         if err != nil {
-                log.Println("error:", err)
+                if DEBUG {
+                        log.Println("error:", err)
+                }
                 ctx.Write([]byte("<h2>Error: "))
                 ctx.Write([]byte(html.EscapeString(err.Error())))