fix & bump

Clivern · Oct 3, 2020 · bd55394 · bd55394
1 parent 8f04c13
commit bd55394
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 14 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,6 +1,6 @@
 FROM golang:1.15.2
 
-ARG RHINO_VERSION=1.2.0
+ARG RHINO_VERSION=1.2.1
 
 ENV GO111MODULE=on
 

diff --git a/README.md b/README.md
@@ -1,11 +1,11 @@
 <p align="center">
-    <img alt="Rhino Logo" src="https://raw.githubusercontent.com/clivern/Rhino/master/assets/img/gopher.png?v=1.2.0" width="150" />
+    <img alt="Rhino Logo" src="https://raw.githubusercontent.com/clivern/Rhino/master/assets/img/gopher.png?v=1.2.1" width="150" />
     <h3 align="center">Rhino</h3>
     <p align="center">HTTP Mocking & Debugging Service</p>
     <p align="center">
         <a href="https://travis-ci.com/Clivern/Rhino"><img src="https://travis-ci.com/Clivern/Rhino.svg?branch=master"></a>
-        <a href="https://github.com/Clivern/Rhino/releases"><img src="https://img.shields.io/badge/Version-1.2.0-red.svg"></a>
-        <a href="https://goreportcard.com/report/github.com/Clivern/Rhino"><img src="https://goreportcard.com/badge/github.com/clivern/Rhino?v=1.2.0"></a>
+        <a href="https://github.com/Clivern/Rhino/releases"><img src="https://img.shields.io/badge/Version-1.2.1-red.svg"></a>
+        <a href="https://goreportcard.com/report/github.com/Clivern/Rhino"><img src="https://goreportcard.com/badge/github.com/clivern/Rhino?v=1.2.1"></a>
         <a href="https://hub.docker.com/r/clivern/rhino"><img src="https://img.shields.io/badge/Docker-Latest-green"></a>
         <a href="https://github.com/Clivern/Rhino/blob/master/LICENSE"><img src="https://img.shields.io/badge/LICENSE-MIT-orange.svg"></a>
     </p>

diff --git a/core/controller/debug.go b/core/controller/debug.go
@@ -6,7 +6,6 @@ package controller
 
 import (
 	"bytes"
-	"encoding/json"
 	"io/ioutil"
 	"math/rand"
 	"net/http"
@@ -30,14 +29,18 @@ func Debug(c *gin.Context) {
 	}
 
 	c.Request.Body = ioutil.NopCloser(bytes.NewBuffer(bodyBytes))
-	header, _ := json.Marshal(c.Request.Header)
 
 	parameters := make(map[string]string)
+	headers := make(map[string]string)
 
 	for k, v := range c.Request.URL.Query() {
 		parameters[k] = v[0]
 	}
 
+	for k, v := range c.Request.Header {
+		headers[k] = v[0]
+	}
+
 	route := model.GetRoute(c.FullPath(), "", parameters)
 
 	rand.Seed(time.Now().UnixNano())
@@ -48,7 +51,7 @@ func Debug(c *gin.Context) {
 		log.WithFields(log.Fields{
 			"method":     c.Request.Method,
 			"url":        c.Request.URL.Path,
-			"header":     header,
+			"headers":    headers,
 			"parameters": parameters,
 			"body":       string(bodyBytes),
 		}).Info("Failed Request")
@@ -64,7 +67,7 @@ func Debug(c *gin.Context) {
 	log.WithFields(log.Fields{
 		"method":     c.Request.Method,
 		"url":        c.Request.URL.Path,
-		"header":     header,
+		"headers":    headers,
 		"parameters": parameters,
 		"body":       string(bodyBytes),
 	}).Info("Request Success")

diff --git a/core/controller/mock.go b/core/controller/mock.go
@@ -6,7 +6,6 @@ package controller
 
 import (
 	"bytes"
-	"encoding/json"
 	"io/ioutil"
 	"math/rand"
 	"net/http"
@@ -32,14 +31,17 @@ func Mock(c *gin.Context) {
 
 	c.Request.Body = ioutil.NopCloser(bytes.NewBuffer(bodyBytes))
 
-	header, _ := json.Marshal(c.Request.Header)
-
 	parameters := make(map[string]string)
+	headers := make(map[string]string)
 
 	for k, v := range c.Request.URL.Query() {
 		parameters[k] = v[0]
 	}
 
+	for k, v := range c.Request.Header {
+		headers[k] = v[0]
+	}
+
 	route := model.GetRoute(c.FullPath(), c.Request.Method, parameters)
 
 	rand.Seed(time.Now().UnixNano())
@@ -50,7 +52,7 @@ func Mock(c *gin.Context) {
 		log.WithFields(log.Fields{
 			"method":     c.Request.Method,
 			"url":        c.Request.URL.Path,
-			"header":     header,
+			"headers":    headers,
 			"parameters": parameters,
 			"body":       string(bodyBytes),
 		}).Info("Failed Request")
@@ -66,7 +68,7 @@ func Mock(c *gin.Context) {
 	log.WithFields(log.Fields{
 		"method":     c.Request.Method,
 		"url":        c.Request.URL.Path,
-		"header":     header,
+		"headers":    headers,
 		"parameters": parameters,
 		"body":       string(bodyBytes),
 	}).Info("Request Success")

diff --git a/deployment/docker-compose/docker-compose.yml b/deployment/docker-compose/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '3'
 services:
     rhino:
-        image: 'clivern/rhino:release-1.2.0'
+        image: 'clivern/rhino:release-1.2.1'
         ports:
             - "8080:8080"
         command: '/app/rhino serve -c /app/configs/config.prod.json'