Skip to content

Commit ef47a83

Browse files
mreifersonmreiferson
committed
move utility packages under /internal
1 parent 271eba1 commit ef47a83

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+46
-46
lines changed

‎apps/nsq_pubsub/nsq_pubsub.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import (
1717
"time"
1818

1919
"github.com/bitly/go-nsq"
20-
"github.com/bitly/nsq/util"
20+
"github.com/bitly/nsq/internal/util"
2121
)
2222

2323
var (

‎apps/nsq_stat/nsq_stat.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ import (
1616
"syscall"
1717
"time"
1818

19-
"github.com/bitly/nsq/util"
20-
"github.com/bitly/nsq/util/lookupd"
19+
"github.com/bitly/nsq/internal/lookupd"
20+
"github.com/bitly/nsq/internal/util"
2121
)
2222

2323
var (

‎apps/nsq_tail/nsq_tail.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
"time"
1212

1313
"github.com/bitly/go-nsq"
14-
"github.com/bitly/nsq/util"
14+
"github.com/bitly/nsq/internal/util"
1515
)
1616

1717
var (

‎apps/nsq_to_file/nsq_to_file.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ import (
2020
"time"
2121

2222
"github.com/bitly/go-nsq"
23-
"github.com/bitly/nsq/util"
24-
"github.com/bitly/nsq/util/lookupd"
23+
"github.com/bitly/nsq/internal/lookupd"
24+
"github.com/bitly/nsq/internal/util"
2525
)
2626

2727
var (

‎apps/nsq_to_http/http.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"fmt"
66
"net/http"
77

8-
"github.com/bitly/nsq/util"
8+
"github.com/bitly/nsq/internal/util"
99
)
1010

1111
var httpclient *http.Client

‎apps/nsq_to_http/nsq_to_http.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121

2222
"github.com/bitly/go-hostpool"
2323
"github.com/bitly/go-nsq"
24-
"github.com/bitly/nsq/util"
24+
"github.com/bitly/nsq/internal/util"
2525
"github.com/bitly/timer_metrics"
2626
)
2727

‎apps/nsq_to_nsq/nsq_to_nsq.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
"github.com/bitly/go-hostpool"
2121
"github.com/bitly/go-nsq"
2222
"github.com/bitly/go-simplejson"
23-
"github.com/bitly/nsq/util"
23+
"github.com/bitly/nsq/internal/util"
2424
"github.com/bitly/timer_metrics"
2525
)
2626

‎apps/nsqd/nsqd.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ import (
1414
"time"
1515

1616
"github.com/BurntSushi/toml"
17+
"github.com/bitly/nsq/internal/util"
1718
"github.com/bitly/nsq/nsqd"
18-
"github.com/bitly/nsq/util"
1919
"github.com/mreiferson/go-options"
2020
)
2121

‎apps/nsqlookupd/nsqlookupd.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import (
1010
"time"
1111

1212
"github.com/BurntSushi/toml"
13+
"github.com/bitly/nsq/internal/util"
1314
"github.com/bitly/nsq/nsqlookupd"
14-
"github.com/bitly/nsq/util"
1515
"github.com/mreiferson/go-options"
1616
)
1717

‎apps/to_nsq/to_nsq.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import (
1414
"syscall"
1515

1616
"github.com/bitly/go-nsq"
17-
"github.com/bitly/nsq/util"
17+
"github.com/bitly/nsq/internal/util"
1818
)
1919

2020
var (

‎util/auth/authorizations.go ‎internal/auth/authorizations.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"regexp"
99
"time"
1010

11-
"github.com/bitly/nsq/util"
11+
"github.com/bitly/nsq/internal/util"
1212
)
1313

1414
type Authorization struct {

‎util/lookupd/lookupd.go ‎internal/lookupd/lookupd.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ import (
1212
"sync"
1313
"time"
1414

15-
"github.com/bitly/nsq/util"
16-
"github.com/bitly/nsq/util/semver"
15+
"github.com/bitly/nsq/internal/semver"
16+
"github.com/bitly/nsq/internal/util"
1717
)
1818

1919
// GetVersion returns a semver.Version object by querying /info

‎util/lookupd/types.go ‎internal/lookupd/types.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import (
55
"sort"
66
"time"
77

8-
"github.com/bitly/nsq/util"
9-
"github.com/bitly/nsq/util/semver"
8+
"github.com/bitly/nsq/internal/semver"
9+
"github.com/bitly/nsq/internal/util"
1010
)
1111

1212
type ProducerTopic struct {

‎util/pqueue/pqueue.go ‎internal/pqueue/pqueue.go

File renamed without changes.

‎util/pqueue/pqueue_test.go ‎internal/pqueue/pqueue_test.go

File renamed without changes.

‎util/semver/semver.go ‎internal/semver/semver.go

File renamed without changes.

‎util/api_request.go ‎internal/util/api_request.go

File renamed without changes.

‎util/api_response.go ‎internal/util/api_response.go

File renamed without changes.

‎util/binary_version.go ‎internal/util/binary_version.go

File renamed without changes.

‎util/byte_base10.go ‎internal/util/byte_base10.go

File renamed without changes.

‎util/byte_base10_test.go ‎internal/util/byte_base10_test.go

File renamed without changes.

‎util/errors.go ‎internal/util/errors.go

File renamed without changes.

‎util/float_array.go ‎internal/util/float_array.go

File renamed without changes.

‎util/http_server.go ‎internal/util/http_server.go

File renamed without changes.

‎util/logger.go ‎internal/util/logger.go

File renamed without changes.

‎util/names.go ‎internal/util/names.go

File renamed without changes.

‎util/parse_opts.go ‎internal/util/parse_opts.go

File renamed without changes.

‎util/percentile.go ‎internal/util/percentile.go

File renamed without changes.

‎util/protocol.go ‎internal/util/protocol.go

File renamed without changes.

‎util/req_params.go ‎internal/util/req_params.go

File renamed without changes.

‎util/statsd.go ‎internal/util/statsd.go

File renamed without changes.

‎util/statsd_client.go ‎internal/util/statsd_client.go

File renamed without changes.

‎util/string_array.go ‎internal/util/string_array.go

File renamed without changes.

‎util/strings.go ‎internal/util/strings.go

File renamed without changes.

‎util/tcp_server.go ‎internal/util/tcp_server.go

File renamed without changes.

‎util/template_functions.go ‎internal/util/template_functions.go

File renamed without changes.

‎util/topic_channel_args.go ‎internal/util/topic_channel_args.go

File renamed without changes.

‎util/wait_group_wrapper.go ‎internal/util/wait_group_wrapper.go

File renamed without changes.

‎nsqadmin/graphs.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
"time"
1313

1414
"github.com/bitly/go-simplejson"
15-
"github.com/bitly/nsq/util"
15+
"github.com/bitly/nsq/internal/util"
1616
)
1717

1818
type GraphTarget interface {

‎nsqadmin/http.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ import (
1414
"strings"
1515
"time"
1616

17+
"github.com/bitly/nsq/internal/lookupd"
18+
"github.com/bitly/nsq/internal/semver"
19+
"github.com/bitly/nsq/internal/util"
1720
"github.com/bitly/nsq/nsqadmin/templates"
18-
"github.com/bitly/nsq/util"
19-
"github.com/bitly/nsq/util/lookupd"
20-
"github.com/bitly/nsq/util/semver"
2121
)
2222

2323
var v1EndpointVersion *semver.Version

‎nsqadmin/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"time"
1111

1212
"github.com/BurntSushi/toml"
13-
"github.com/bitly/nsq/util"
13+
"github.com/bitly/nsq/internal/util"
1414
"github.com/mreiferson/go-options"
1515
)
1616

‎nsqadmin/nsqadmin.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"os"
1111
"time"
1212

13-
"github.com/bitly/nsq/util"
13+
"github.com/bitly/nsq/internal/util"
1414
)
1515

1616
type NSQAdmin struct {

‎nsqd/channel.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import (
1010
"sync/atomic"
1111
"time"
1212

13-
"github.com/bitly/nsq/util"
14-
"github.com/bitly/nsq/util/pqueue"
13+
"github.com/bitly/nsq/internal/pqueue"
14+
"github.com/bitly/nsq/internal/util"
1515
)
1616

1717
// the amount of time a worker will wait when idle

‎nsqd/client_v2.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"sync/atomic"
1111
"time"
1212

13-
"github.com/bitly/nsq/util/auth"
13+
"github.com/bitly/nsq/internal/auth"
1414
"github.com/mreiferson/go-snappystream"
1515
)
1616

‎nsqd/http.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import (
1414
"strings"
1515
"time"
1616

17-
"github.com/bitly/nsq/util"
17+
"github.com/bitly/nsq/internal/util"
1818
)
1919

2020
type httpServer struct {

‎nsqd/http_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import (
1414
"time"
1515

1616
"github.com/bitly/go-nsq"
17-
"github.com/bitly/nsq/util"
17+
"github.com/bitly/nsq/internal/util"
1818
)
1919

2020
func TestHTTPput(t *testing.T) {

‎nsqd/lookup.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"time"
1010

1111
"github.com/bitly/go-nsq"
12-
"github.com/bitly/nsq/util"
12+
"github.com/bitly/nsq/internal/util"
1313
)
1414

1515
func (n *NSQD) lookupLoop() {

‎nsqd/nsqd.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ import (
1919
"time"
2020

2121
"github.com/bitly/go-simplejson"
22-
"github.com/bitly/nsq/util"
23-
"github.com/bitly/nsq/util/lookupd"
22+
"github.com/bitly/nsq/internal/lookupd"
23+
"github.com/bitly/nsq/internal/util"
2424
)
2525

2626
const (

‎nsqd/protocol_v2.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import (
1414
"time"
1515
"unsafe"
1616

17-
"github.com/bitly/nsq/util"
17+
"github.com/bitly/nsq/internal/util"
1818
)
1919

2020
const maxTimeout = time.Hour

‎nsqd/protocol_v2_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
"time"
2323

2424
"github.com/bitly/go-nsq"
25-
"github.com/bitly/nsq/util"
25+
"github.com/bitly/nsq/internal/util"
2626
"github.com/mreiferson/go-snappystream"
2727
)
2828

‎nsqd/rename_windows_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
"testing"
1313
"time"
1414

15-
"github.com/bitly/nsq/util"
15+
"github.com/bitly/nsq/internal/util"
1616
)
1717

1818
const TEST_FILE_COUNT = 500

‎nsqd/stats.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package nsqd
33
import (
44
"sort"
55

6-
"github.com/bitly/nsq/util"
6+
"github.com/bitly/nsq/internal/util"
77
)
88

99
type TopicStats struct {

‎nsqd/stats_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"testing"
88
"time"
99

10-
"github.com/bitly/nsq/util"
10+
"github.com/bitly/nsq/internal/util"
1111
"github.com/mreiferson/go-snappystream"
1212
)
1313

‎nsqd/statsd.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"sort"
88
"time"
99

10-
"github.com/bitly/nsq/util"
10+
"github.com/bitly/nsq/internal/util"
1111
)
1212

1313
type Uint64Slice []uint64

‎nsqd/tcp.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"io"
55
"net"
66

7-
"github.com/bitly/nsq/util"
7+
"github.com/bitly/nsq/internal/util"
88
)
99

1010
type tcpServer struct {

‎nsqd/test/cluster_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"testing"
1111
"time"
1212

13-
"github.com/bitly/nsq/util"
13+
"github.com/bitly/nsq/internal/util"
1414
)
1515

1616
func equal(t *testing.T, act, exp interface{}) {

‎nsqd/topic.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"sync"
88
"sync/atomic"
99

10-
"github.com/bitly/nsq/util"
10+
"github.com/bitly/nsq/internal/util"
1111
)
1212

1313
type Topic struct {

‎nsqlookupd/http.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
httpprof "net/http/pprof"
88
"sync/atomic"
99

10-
"github.com/bitly/nsq/util"
10+
"github.com/bitly/nsq/internal/util"
1111
)
1212

1313
type httpServer struct {

‎nsqlookupd/lookup_protocol_v1.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import (
1313
"sync/atomic"
1414
"time"
1515

16-
"github.com/bitly/nsq/util"
16+
"github.com/bitly/nsq/internal/util"
1717
)
1818

1919
type LookupProtocolV1 struct {

‎nsqlookupd/nsqlookupd.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"net"
66
"os"
77

8-
"github.com/bitly/nsq/util"
8+
"github.com/bitly/nsq/internal/util"
99
)
1010

1111
type NSQLookupd struct {

‎nsqlookupd/nsqlookupd_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import (
1010
"time"
1111

1212
"github.com/bitly/go-nsq"
13-
"github.com/bitly/nsq/util"
14-
lookuputil "github.com/bitly/nsq/util/lookupd"
13+
lookuputil "github.com/bitly/nsq/internal/lookupd"
14+
"github.com/bitly/nsq/internal/util"
1515
)
1616

1717
func equal(t *testing.T, act, exp interface{}) {

‎nsqlookupd/tcp.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"io"
55
"net"
66

7-
"github.com/bitly/nsq/util"
7+
"github.com/bitly/nsq/internal/util"
88
)
99

1010
type tcpServer struct {

0 commit comments

Comments
 (0)