From e7c1d86bfacff37099ca3797472c54d2bfdec679 Mon Sep 17 00:00:00 2001
From: Dan Carley <dan.carley@gmail.com>
Date: Wed, 23 Oct 2013 17:06:58 +0100
Subject: [PATCH] Move ParsedRequest{} to gor/utils sub-package

This de-dupes the type definition used in both `listener` and `replay`.
---
 listener/listener.go         |  9 +++------
 replay/replay_file_parser.go | 17 ++++-------------
 utils/utils.go               | 14 ++++++++++++++
 3 files changed, 21 insertions(+), 19 deletions(-)
 create mode 100644 utils/utils.go

diff --git a/listener/listener.go b/listener/listener.go
index 9965aa9..3427fa5 100644
--- a/listener/listener.go
+++ b/listener/listener.go
@@ -15,12 +15,9 @@ import (
 	"os"
 	"strconv"
 	"time"
-)
 
-type ParsedRequest struct {
-	Timestamp int64
-	Request   []byte
-}
+	"github.com/buger/gor/utils"
+)
 
 // Debug enables logging only if "--verbose" flag passed
 func Debug(v ...interface{}) {
@@ -97,7 +94,7 @@ func Run() {
 
 		if Settings.FileToReplayPath != "" {
 			go func() {
-				message := ParsedRequest{time.Now().UnixNano(), m.Bytes()}
+				message := utils.ParsedRequest{time.Now().UnixNano(), m.Bytes()}
 				fileEnc.Encode(message)
 			}()
 		} else {
diff --git a/replay/replay_file_parser.go b/replay/replay_file_parser.go
index 216d5d2..4cecf5f 100644
--- a/replay/replay_file_parser.go
+++ b/replay/replay_file_parser.go
@@ -7,19 +7,10 @@ import (
 	"io/ioutil"
 	"log"
 
-	"fmt"
+	"github.com/buger/gor/utils"
 )
 
-type ParsedRequest struct {
-	Timestamp int64
-	Request   []byte
-}
-
-func (self ParsedRequest) String() string {
-	return fmt.Sprintf("Request: %v, timestamp: %v", string(self.Request), self.Timestamp)
-}
-
-func parseReplayFile() (requests []ParsedRequest, err error) {
+func parseReplayFile() (requests []utils.ParsedRequest, err error) {
 	requests, err = readLines(Settings.FileToReplayPath)
 
 	if err != nil {
@@ -31,7 +22,7 @@ func parseReplayFile() (requests []ParsedRequest, err error) {
 
 // readLines reads a whole file into memory
 // and returns a slice of request+timestamps.
-func readLines(path string) (requests []ParsedRequest, err error) {
+func readLines(path string) (requests []utils.ParsedRequest, err error) {
 	file, err := ioutil.ReadFile(path)
 
 	if err != nil {
@@ -42,7 +33,7 @@ func readLines(path string) (requests []ParsedRequest, err error) {
 	fileDec := gob.NewDecoder(fileBuf)
 
 	for err == nil {
-		var reqBuf ParsedRequest
+		var reqBuf utils.ParsedRequest
 		err = fileDec.Decode(&reqBuf)
 
 		if err == io.EOF {
diff --git a/utils/utils.go b/utils/utils.go
new file mode 100644
index 0000000..c178909
--- /dev/null
+++ b/utils/utils.go
@@ -0,0 +1,14 @@
+package utils
+
+import (
+	"fmt"
+)
+
+type ParsedRequest struct {
+	Timestamp int64
+	Request   []byte
+}
+
+func (self ParsedRequest) String() string {
+	return fmt.Sprintf("Request: %v, timestamp: %v", string(self.Request), self.Timestamp)
+}