Skip to content

Commit e7c1d86

Browse files
committed
Move ParsedRequest{} to gor/utils sub-package
This de-dupes the type definition used in both `listener` and `replay`.
1 parent 7143078 commit e7c1d86

3 files changed

Lines changed: 21 additions & 19 deletions

File tree

listener/listener.go

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,9 @@ import (
1515
"os"
1616
"strconv"
1717
"time"
18-
)
1918

20-
type ParsedRequest struct {
21-
Timestamp int64
22-
Request []byte
23-
}
19+
"github.com/buger/gor/utils"
20+
)
2421

2522
// Debug enables logging only if "--verbose" flag passed
2623
func Debug(v ...interface{}) {
@@ -97,7 +94,7 @@ func Run() {
9794

9895
if Settings.FileToReplayPath != "" {
9996
go func() {
100-
message := ParsedRequest{time.Now().UnixNano(), m.Bytes()}
97+
message := utils.ParsedRequest{time.Now().UnixNano(), m.Bytes()}
10198
fileEnc.Encode(message)
10299
}()
103100
} else {

replay/replay_file_parser.go

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,10 @@ import (
77
"io/ioutil"
88
"log"
99

10-
"fmt"
10+
"github.com/buger/gor/utils"
1111
)
1212

13-
type ParsedRequest struct {
14-
Timestamp int64
15-
Request []byte
16-
}
17-
18-
func (self ParsedRequest) String() string {
19-
return fmt.Sprintf("Request: %v, timestamp: %v", string(self.Request), self.Timestamp)
20-
}
21-
22-
func parseReplayFile() (requests []ParsedRequest, err error) {
13+
func parseReplayFile() (requests []utils.ParsedRequest, err error) {
2314
requests, err = readLines(Settings.FileToReplayPath)
2415

2516
if err != nil {
@@ -31,7 +22,7 @@ func parseReplayFile() (requests []ParsedRequest, err error) {
3122

3223
// readLines reads a whole file into memory
3324
// and returns a slice of request+timestamps.
34-
func readLines(path string) (requests []ParsedRequest, err error) {
25+
func readLines(path string) (requests []utils.ParsedRequest, err error) {
3526
file, err := ioutil.ReadFile(path)
3627

3728
if err != nil {
@@ -42,7 +33,7 @@ func readLines(path string) (requests []ParsedRequest, err error) {
4233
fileDec := gob.NewDecoder(fileBuf)
4334

4435
for err == nil {
45-
var reqBuf ParsedRequest
36+
var reqBuf utils.ParsedRequest
4637
err = fileDec.Decode(&reqBuf)
4738

4839
if err == io.EOF {

utils/utils.go

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
package utils
2+
3+
import (
4+
"fmt"
5+
)
6+
7+
type ParsedRequest struct {
8+
Timestamp int64
9+
Request []byte
10+
}
11+
12+
func (self ParsedRequest) String() string {
13+
return fmt.Sprintf("Request: %v, timestamp: %v", string(self.Request), self.Timestamp)
14+
}

0 commit comments

Comments
 (0)