From 588e406978030a039ac5bdf3dc73f7bf528c9c0e Mon Sep 17 00:00:00 2001 From: 9seconds Date: Wed, 30 May 2018 21:12:47 +0300 Subject: [PATCH] Rename server to proxy --- main.go | 5 ++--- {server => proxy}/cipherrwc.go | 2 +- {server => proxy}/ctxrwc.go | 2 +- {server => proxy}/logrwc.go | 2 +- {server => proxy}/server.go | 2 +- {server => proxy}/telegram.go | 2 +- {server => proxy}/timeoutrwc.go | 2 +- 7 files changed, 8 insertions(+), 9 deletions(-) rename {server => proxy}/cipherrwc.go (98%) rename {server => proxy}/ctxrwc.go (98%) rename {server => proxy}/logrwc.go (98%) rename {server => proxy}/server.go (99%) rename {server => proxy}/telegram.go (98%) rename {server => proxy}/timeoutrwc.go (98%) diff --git a/main.go b/main.go index 4903af2..3488355 100644 --- a/main.go +++ b/main.go @@ -11,11 +11,10 @@ import ( "strconv" "strings" + "github.com/9seconds/mtg/proxy" "go.uber.org/zap" "go.uber.org/zap/zapcore" kingpin "gopkg.in/alecthomas/kingpin.v2" - - "github.com/9seconds/mtg/server" ) var ( @@ -96,7 +95,7 @@ func main() { )).Sugar() printURLs() - srv := server.NewServer(*bindIP, int(*bindPort), secretBytes, logger, + srv := proxy.NewServer(*bindIP, int(*bindPort), secretBytes, logger, *readTimeout, *writeTimeout) if err := srv.Serve(); err != nil { logger.Fatal(err.Error()) diff --git a/server/cipherrwc.go b/proxy/cipherrwc.go similarity index 98% rename from server/cipherrwc.go rename to proxy/cipherrwc.go index 2d2a774..549fd23 100644 --- a/server/cipherrwc.go +++ b/proxy/cipherrwc.go @@ -1,4 +1,4 @@ -package server +package proxy import ( "bytes" diff --git a/server/ctxrwc.go b/proxy/ctxrwc.go similarity index 98% rename from server/ctxrwc.go rename to proxy/ctxrwc.go index 064074e..ea9413e 100644 --- a/server/ctxrwc.go +++ b/proxy/ctxrwc.go @@ -1,4 +1,4 @@ -package server +package proxy import ( "context" diff --git a/server/logrwc.go b/proxy/logrwc.go similarity index 98% rename from server/logrwc.go rename to proxy/logrwc.go index 4eb27fc..8a0ad28 100644 --- a/server/logrwc.go +++ b/proxy/logrwc.go @@ -1,4 +1,4 @@ -package server +package proxy import ( "io" diff --git a/server/server.go b/proxy/server.go similarity index 99% rename from server/server.go rename to proxy/server.go index bd5ac00..7be96d4 100644 --- a/server/server.go +++ b/proxy/server.go @@ -1,4 +1,4 @@ -package server +package proxy import ( "context" diff --git a/server/telegram.go b/proxy/telegram.go similarity index 98% rename from server/telegram.go rename to proxy/telegram.go index 22e1335..75b42d6 100644 --- a/server/telegram.go +++ b/proxy/telegram.go @@ -1,4 +1,4 @@ -package server +package proxy import ( "net" diff --git a/server/timeoutrwc.go b/proxy/timeoutrwc.go similarity index 98% rename from server/timeoutrwc.go rename to proxy/timeoutrwc.go index 2e56b40..4e0ca48 100644 --- a/server/timeoutrwc.go +++ b/proxy/timeoutrwc.go @@ -1,4 +1,4 @@ -package server +package proxy import ( "io"