Merge branch 'master' into head-request

istio · Jan 12, 2017 · 66a4de9 · 66a4de9
2 parents 4d222d0 + c3abd2a
commit 66a4de9
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 16 deletions.
diff --git a/src/envoy/prototype/README.md b/src/envoy/prototype/README.md
@@ -36,6 +36,19 @@ This Proxy will use Envoy and talk to Mixer server.
   go run echo.go
 ```
 
+* Modify your iptables:
+
+```
+  sudo iptables -t nat -A OUTPUT -p tcp --dport 9090 -j REDIRECT --to-port 9092
+```
+
+Once you are done, you should remove this rule:
+
+```
+  sudo iptables -t nat -D OUTPUT -p tcp --dport 9090 -j REDIRECT --to-port 9092
+```
+
+
 * Start Envoy proxy, run
 
 ```

diff --git a/src/envoy/prototype/envoy-esp.conf b/src/envoy/prototype/envoy-esp.conf
@@ -1,7 +1,14 @@
 {
   "listeners": [
+    {
+      "port": 9092,
+      "bind_to_port": true,
+      "use_original_dst": true,
+      "filters": []
+    },
     {
       "port": 9090,
+      "bind_to_port": false,
       "filters": [
         {
           "type": "read",
@@ -26,7 +33,7 @@
             },
             "access_log": [
               {
-                "path": "/tmp/access.envoy"
+                "path": "/dev/stdout"
               }
             ],
             "filters": [
@@ -50,7 +57,7 @@
     }
   ],
   "admin": {
-    "access_log_path": "/tmp/access.envoy",
+    "access_log_path": "/dev/stdout",
     "port": 9001
   },
   "cluster_manager": {

diff --git a/test/backend/echo/echo.go b/test/backend/echo/echo.go
@@ -23,19 +23,22 @@ import (
 	"io/ioutil"
 	"net/http"
 	"strconv"
-	"sync"
-	"time"
 )
 
 var (
 	port = flag.Int("port", 8080, "default http port")
 
-	mu       sync.Mutex
 	requests = 0
 	data     = 0
 )
 
 func handler(w http.ResponseWriter, r *http.Request) {
+	fmt.Printf("%v %v %v %v\n", r.Method, r.URL, r.Proto, r.RemoteAddr)
+	for name, headers := range r.Header {
+		for _, h := range headers {
+			fmt.Printf("%v: %v\n", name, h)
+		}
+	}
 	body, err := ioutil.ReadAll(r.Body)
 	if err != nil {
 		http.Error(w, err.Error(), http.StatusInternalServerError)
@@ -51,24 +54,14 @@ func handler(w http.ResponseWriter, r *http.Request) {
 	w.WriteHeader(http.StatusOK)
 	w.Write(body)
 
-	mu.Lock()
 	requests++
 	data += len(body)
-	defer mu.Unlock()
+	fmt.Printf("Requests Requests: %v  Data: %v\n", requests, data)
 }
 
 func main() {
 	flag.Parse()
 
-	go func() {
-		for {
-			mu.Lock()
-			fmt.Printf("Requests Requests: %v  Data: %v\n", requests, data)
-			mu.Unlock()
-			time.Sleep(time.Second)
-		}
-	}()
-
 	fmt.Printf("Listening on port %v\n", *port)
 
 	http.HandleFunc("/", handler)