Skip to content

Commit

Permalink
s/bitly/nsqio
Browse files Browse the repository at this point in the history
  • Loading branch information
mreiferson committed Aug 31, 2015
1 parent b5b1f65 commit c3b3f73
Show file tree
Hide file tree
Showing 57 changed files with 245 additions and 234 deletions.
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,5 +33,5 @@ nsqd: fixed bug in protocol_v2
## Submitting Changes

* push your changes to your branch in your fork of the repository
* submit a pull request against bitly's repository
* submit a pull request against nsqio's repository
* comment in the pull request when you're ready for the changes to be reviewed: `"ready for review"`
18 changes: 9 additions & 9 deletions ChangeLog.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ Bugs:
NOTE: the bundled utilities are built against [`go-nsq` `v1.0.4`][go-nsq_104] and include all of
those features/fixes.

[go-nsq_104]: https://github.com/bitly/go-nsq/releases/tag/v1.0.4
[go-nsq_104]: https://github.com/nsqio/go-nsq/releases/tag/v1.0.4

### 0.3.2 - 2015-02-08

Expand All @@ -62,7 +62,7 @@ The new image is an order of magnitude smaller, weighing in around 70mb.

In addition, the impetus for this quick release is to address a slew of reconnect related bug fixes
in the utility apps (`nsq_to_nsq`, `nsq_to_file`, etc.), for details see the [`go-nsq` `v1.0.3`
release notes](https://github.com/bitly/go-nsq/releases/tag/v1.0.3).
release notes](https://github.com/nsqio/go-nsq/releases/tag/v1.0.3).

Features:

Expand Down Expand Up @@ -115,7 +115,7 @@ means that client libraries no longer have to periodically re-send `RDY`. For so
already provided back-pressure due to the fact that a client must respond to messages before
receiving new ones. The decremented `RDY` count only made the implementation of the server and
client more complex without additional benefit. Now the `RDY` command can be treated as an "on/off"
switch. For details see #404 and the associated changes in bitly/go-nsq#83 and bitly/pynsq#98.
switch. For details see #404 and the associated changes in nsqio/go-nsq#83 and nsqio/pynsq#98.

The second biggest change (and oft-requested feature!) is `#ephemeral` topics. Their behavior
mirrors that of channels. This feature is incredibly useful for situations where you're using
Expand Down Expand Up @@ -280,7 +280,7 @@ client certificate policy via `--tls-client-auth-policy` (`require` or `require-
This can be used as a form of client authentication.

Additionally, `nsqd` is now structured such that it is importable in other Go applications
via `github.com/bitly/nsq/nsqd`, thanks to @kzvezdarov.
via `github.com/nsqio/nsq/nsqd`, thanks to @kzvezdarov.

Finally, thanks to @paddyforan, `nsq_to_file` can now archive *multiple* topics or
optionally archive *all* discovered topics (by specifying no `--topic` params
Expand All @@ -291,15 +291,15 @@ New Features / Enhancements:
* #334 - `nsq_to_file` can archive many topics (thanks @paddyforan)
* #327 - add `nsqd` TLS client certificate verification policy, ability
to require TLS, and HTTPS support (thanks @chrisroberts)
* #325 - make `nsqd` importable (`github.com/bitly/nsq/nsqd`) (thanks @kzvezdarov)
* #325 - make `nsqd` importable (`github.com/nsqio/nsq/nsqd`) (thanks @kzvezdarov)
* #321 - improve `IDENTIFY` options (replace `short_id` and `long_id` with
`client_id` and `hostname`)
* #319 - allow path separator in `nsq_to_file` filenames (thanks @jsocol)
* #324 - display memory depth and total depth in `nsq_stat`

Bug Fixes:

* bitly/go-nsq#19 and bitly/go-nsq#29 - fix deadlocks on `nsq.Reader` connection close/exit, this
* nsqio/go-nsq#19 and nsqio/go-nsq#29 - fix deadlocks on `nsq.Reader` connection close/exit, this
impacts the utilities packaged with the NSQ binary
distribution such as `nsq_to_file`, `nsq_to_http`,
`nsq_to_nsq` and `nsq_tail`.
Expand Down Expand Up @@ -416,7 +416,7 @@ New Features / Enhancements:
**Upgrading from 0.2.22**: No backwards incompatible changes.

We now use [godep](https://github.com/kr/godep) in order to achieve reproducible builds with pinned
dependencies. If you're on go1.1+ you can now just use `godep get github.com/bitly/nsq/...`.
dependencies. If you're on go1.1+ you can now just use `godep get github.com/nsqio/nsq/...`.

This release includes `nsqd` protocol compression feature negotiation.
[Snappy](https://code.google.com/p/snappy/) and [Deflate](http://en.wikipedia.org/wiki/DEFLATE) are
Expand Down Expand Up @@ -723,8 +723,8 @@ removed in a future release.

## go-nsq Client Library

* #264 moved **go-nsq** to its own [repository](https://github.com/bitly/go-nsq)
* #264 moved **go-nsq** to its own [repository](https://github.com/nsqio/go-nsq)

## pynsq Python Client Library

* #88 moved **pynsq** to its own [repository](https://github.com/bitly/pynsq)
* #88 moved **pynsq** to its own [repository](https://github.com/nsqio/pynsq)
2 changes: 1 addition & 1 deletion Godeps
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
github.com/BurntSushi/toml 2dff11163ee667d51dcc066660925a92ce138deb
github.com/bitly/go-hostpool 58b95b10d6ca26723a7f46017b348653b825a8d6
github.com/bitly/go-nsq 0f97a46d801c18d6fd1a12a9040d11cc4e4ef397 # v1.0.5-alpha
github.com/nsqio/go-nsq 0f97a46d801c18d6fd1a12a9040d11cc4e4ef397 # v1.0.5-alpha
github.com/bitly/go-simplejson 18db6e68d8fd9cbf2e8ebe4c81a78b96fd9bf05a
github.com/bmizerany/perks/quantile 6cb9d9d729303ee2628580d9aec5db968da3a607
github.com/mreiferson/go-options 2cf7eb1fdd83e2bb3375fef6fdadb04c3ad564da
Expand Down
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<p align="center"><img src="http://nsq.io/static/img/nsq.png"/></p>

* **Source**: [https://github.com/bitly/nsq][github]
* **Issues**: [https://github.com/bitly/nsq/issues][issues]
* **Source**: [https://github.com/nsqio/nsq][github]
* **Issues**: [https://github.com/nsqio/nsq/issues][issues]
* **Mailing List**: [[email protected]](https://groups.google.com/d/forum/nsq-users)
* **IRC**: #nsq on freenode
* **Docs**: [http://nsq.io][docs]
* **Twitter**: [@nsqio][nsqio_twitter]

[![Build Status](https://secure.travis-ci.org/bitly/nsq.svg?branch=master)](http://travis-ci.org/bitly/nsq)
[![Build Status](https://secure.travis-ci.org/nsqio/nsq.svg?branch=master)](http://travis-ci.org/nsqio/nsq)

**NSQ** is a realtime distributed messaging platform designed to operate at scale, handling
billions of messages per day.
Expand Down Expand Up @@ -71,16 +71,16 @@ NSQ was designed and developed by Matt Reiferson ([@imsnakes][snakes_twitter]) a
[bitly][bitly] and all our [contributors][contributors].

[docs]: http://nsq.io/
[github]: https://github.com/bitly/nsq
[issues]: https://github.com/bitly/nsq/issues
[github]: https://github.com/nsqio/nsq
[issues]: https://github.com/nsqio/nsq/issues
[changelog]: ChangeLog.md
[protocol]: http://nsq.io/clients/tcp_protocol_spec.html
[installing]: http://nsq.io/deployment/installing.html
[snakes_twitter]: https://twitter.com/imsnakes
[jehiah_twitter]: https://twitter.com/jehiah
[bitly]: https://bitly.com
[features_guarantees]: http://nsq.io/overview/features_and_guarantees.html
[latest_tag]: https://github.com/bitly/nsq/releases/tag/v0.3.5
[contributors]: https://github.com/bitly/nsq/graphs/contributors
[latest_tag]: https://github.com/nsqio/nsq/releases/tag/v0.3.5
[contributors]: https://github.com/nsqio/nsq/graphs/contributors
[client_libraries]: http://nsq.io/clients/client_libraries.html
[nsqio_twitter]: https://twitter.com/nsqio
8 changes: 4 additions & 4 deletions apps/nsq_pubsub/nsq_pubsub.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ import (
"sync/atomic"
"time"

"github.com/bitly/go-nsq"
"github.com/bitly/nsq/internal/app"
"github.com/bitly/nsq/internal/http_api"
"github.com/bitly/nsq/internal/version"
"github.com/nsqio/go-nsq"
"github.com/nsqio/nsq/internal/app"
"github.com/nsqio/nsq/internal/http_api"
"github.com/nsqio/nsq/internal/version"
)

var (
Expand Down
8 changes: 4 additions & 4 deletions apps/nsq_stat/nsq_stat.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ import (
"syscall"
"time"

"github.com/bitly/nsq/internal/app"
"github.com/bitly/nsq/internal/clusterinfo"
"github.com/bitly/nsq/internal/http_api"
"github.com/bitly/nsq/internal/version"
"github.com/nsqio/nsq/internal/app"
"github.com/nsqio/nsq/internal/clusterinfo"
"github.com/nsqio/nsq/internal/http_api"
"github.com/nsqio/nsq/internal/version"
)

var (
Expand Down
8 changes: 4 additions & 4 deletions apps/nsq_tail/nsq_tail.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ import (
"syscall"
"time"

"github.com/bitly/go-nsq"
"github.com/bitly/nsq/internal/app"
"github.com/bitly/nsq/internal/version"
"github.com/nsqio/go-nsq"
"github.com/nsqio/nsq/internal/app"
"github.com/nsqio/nsq/internal/version"
)

var (
Expand Down Expand Up @@ -57,7 +57,7 @@ func main() {
cfg := nsq.NewConfig()
// TODO: remove, deprecated
flag.Var(&nsq.ConfigFlag{cfg}, "reader-opt", "(deprecated) use --consumer-opt")
flag.Var(&nsq.ConfigFlag{cfg}, "consumer-opt", "option to passthrough to nsq.Consumer (may be given multiple times, http://godoc.org/github.com/bitly/go-nsq#Config)")
flag.Var(&nsq.ConfigFlag{cfg}, "consumer-opt", "option to passthrough to nsq.Consumer (may be given multiple times, http://godoc.org/github.com/nsqio/go-nsq#Config)")

flag.Parse()

Expand Down
12 changes: 6 additions & 6 deletions apps/nsq_to_file/nsq_to_file.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ import (
"syscall"
"time"

"github.com/bitly/go-nsq"
"github.com/bitly/nsq/internal/app"
"github.com/bitly/nsq/internal/clusterinfo"
"github.com/bitly/nsq/internal/http_api"
"github.com/bitly/nsq/internal/version"
"github.com/nsqio/go-nsq"
"github.com/nsqio/nsq/internal/app"
"github.com/nsqio/nsq/internal/clusterinfo"
"github.com/nsqio/nsq/internal/http_api"
"github.com/nsqio/nsq/internal/version"
)

var (
Expand Down Expand Up @@ -460,7 +460,7 @@ func main() {

// TODO: remove, deprecated
flag.Var(&nsq.ConfigFlag{cfg}, "reader-opt", "(deprecated) use --consumer-opt")
flag.Var(&nsq.ConfigFlag{cfg}, "consumer-opt", "option to passthrough to nsq.Consumer (may be given multiple times, http://godoc.org/github.com/bitly/go-nsq#Config)")
flag.Var(&nsq.ConfigFlag{cfg}, "consumer-opt", "option to passthrough to nsq.Consumer (may be given multiple times, http://godoc.org/github.com/nsqio/go-nsq#Config)")

flag.Parse()

Expand Down
4 changes: 2 additions & 2 deletions apps/nsq_to_http/http.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"fmt"
"net/http"

"github.com/bitly/nsq/internal/http_api"
"github.com/bitly/nsq/internal/version"
"github.com/nsqio/nsq/internal/http_api"
"github.com/nsqio/nsq/internal/version"
)

var httpclient *http.Client
Expand Down
9 changes: 4 additions & 5 deletions apps/nsq_to_http/nsq_to_http.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ import (
"time"

"github.com/bitly/go-hostpool"
"github.com/bitly/go-nsq"
"github.com/bitly/nsq/internal/app"
"github.com/bitly/nsq/internal/version"
"github.com/nsqio/go-nsq"
"github.com/nsqio/nsq/internal/app"
"github.com/nsqio/nsq/internal/version"
"github.com/bitly/timer_metrics"
)

Expand Down Expand Up @@ -59,7 +59,6 @@ var (
)

func init() {

flag.Var(&postAddrs, "post", "HTTP address to make a POST request to. data will be in the body (may be given multiple times)")
flag.Var(&getAddrs, "get", "HTTP address to make a GET request to. '%s' will be printf replaced with data (may be given multiple times)")
flag.Var(&nsqdTCPAddrs, "nsqd-tcp-address", "nsqd TCP address (may be given multiple times)")
Expand Down Expand Up @@ -170,7 +169,7 @@ func main() {
cfg := nsq.NewConfig()
// TODO: remove, deprecated
flag.Var(&nsq.ConfigFlag{cfg}, "reader-opt", "(deprecated) use --consumer-opt")
flag.Var(&nsq.ConfigFlag{cfg}, "consumer-opt", "option to passthrough to nsq.Consumer (may be given multiple times, http://godoc.org/github.com/bitly/go-nsq#Config)")
flag.Var(&nsq.ConfigFlag{cfg}, "consumer-opt", "option to passthrough to nsq.Consumer (may be given multiple times, http://godoc.org/github.com/nsqio/go-nsq#Config)")

var publisher Publisher
var addresses app.StringArray
Expand Down
13 changes: 7 additions & 6 deletions apps/nsq_to_nsq/nsq_to_nsq.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,13 @@ import (
"time"

"github.com/bitly/go-hostpool"
"github.com/bitly/go-nsq"
"github.com/bitly/go-simplejson"
"github.com/bitly/nsq/internal/app"
"github.com/bitly/nsq/internal/protocol"
"github.com/bitly/nsq/internal/version"
"github.com/bitly/timer_metrics"
"github.com/nsqio/go-nsq"
"github.com/nsqio/nsq/internal/app"
"github.com/nsqio/nsq/internal/protocol"
"github.com/nsqio/nsq/internal/version"

)

const (
Expand Down Expand Up @@ -272,8 +273,8 @@ func main() {

// TODO: remove, deprecated
flag.Var(&nsq.ConfigFlag{cCfg}, "reader-opt", "(deprecated) use --consumer-opt")
flag.Var(&nsq.ConfigFlag{cCfg}, "consumer-opt", "option to passthrough to nsq.Consumer (may be given multiple times, see http://godoc.org/github.com/bitly/go-nsq#Config)")
flag.Var(&nsq.ConfigFlag{pCfg}, "producer-opt", "option to passthrough to nsq.Producer (may be given multiple times, see http://godoc.org/github.com/bitly/go-nsq#Config)")
flag.Var(&nsq.ConfigFlag{cCfg}, "consumer-opt", "option to passthrough to nsq.Consumer (may be given multiple times, see http://godoc.org/github.com/nsqio/go-nsq#Config)")
flag.Var(&nsq.ConfigFlag{pCfg}, "producer-opt", "option to passthrough to nsq.Producer (may be given multiple times, see http://godoc.org/github.com/nsqio/go-nsq#Config)")

flag.Parse()

Expand Down
6 changes: 3 additions & 3 deletions apps/nsqadmin/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ import (
"time"

"github.com/BurntSushi/toml"
"github.com/bitly/nsq/internal/app"
"github.com/bitly/nsq/internal/version"
"github.com/bitly/nsq/nsqadmin"
"github.com/nsqio/nsq/internal/app"
"github.com/nsqio/nsq/internal/version"
"github.com/nsqio/nsq/nsqadmin"
"github.com/mreiferson/go-options"
)

Expand Down
6 changes: 3 additions & 3 deletions apps/nsqd/nsqd.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ import (
"time"

"github.com/BurntSushi/toml"
"github.com/bitly/nsq/internal/app"
"github.com/bitly/nsq/internal/version"
"github.com/bitly/nsq/nsqd"
"github.com/nsqio/nsq/internal/app"
"github.com/nsqio/nsq/internal/version"
"github.com/nsqio/nsq/nsqd"
"github.com/mreiferson/go-options"
)

Expand Down
2 changes: 1 addition & 1 deletion apps/nsqd/nsqd_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"testing"

"github.com/BurntSushi/toml"
"github.com/bitly/nsq/nsqd"
"github.com/nsqio/nsq/nsqd"
"github.com/mreiferson/go-options"
)

Expand Down
4 changes: 2 additions & 2 deletions apps/nsqlookupd/nsqlookupd.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (
"time"

"github.com/BurntSushi/toml"
"github.com/bitly/nsq/internal/version"
"github.com/bitly/nsq/nsqlookupd"
"github.com/nsqio/nsq/internal/version"
"github.com/nsqio/nsq/nsqlookupd"
"github.com/mreiferson/go-options"
)

Expand Down
8 changes: 4 additions & 4 deletions apps/to_nsq/to_nsq.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ import (
"os/signal"
"syscall"

"github.com/bitly/go-nsq"
"github.com/bitly/nsq/internal/app"
"github.com/bitly/nsq/internal/version"
"github.com/nsqio/go-nsq"
"github.com/nsqio/nsq/internal/app"
"github.com/nsqio/nsq/internal/version"
)

var (
Expand All @@ -31,7 +31,7 @@ func init() {

func main() {
cfg := nsq.NewConfig()
flag.Var(&nsq.ConfigFlag{cfg}, "producer-opt", "option to passthrough to nsq.Producer (may be given multiple times, http://godoc.org/github.com/bitly/go-nsq#Config)")
flag.Var(&nsq.ConfigFlag{cfg}, "producer-opt", "option to passthrough to nsq.Producer (may be given multiple times, http://godoc.org/github.com/nsqio/go-nsq#Config)")

flag.Parse()

Expand Down
Loading

0 comments on commit c3b3f73

Please sign in to comment.