Merge 4ec8e40 into 5f1562b

nats-io · May 21, 2019 · 841ad04 · 841ad04
2 parents 5f1562b + 4ec8e40
commit 841ad04
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 50 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,6 +3,9 @@ sudo: false
 go:
 - 1.11.x
 - 1.12.x
+env:
+- GO111MODULE=off
+go_import_path: github.com/nats-io/nats-streaming-server
 install:
 - go get -t ./...
 - go get github.com/nats-io/gnatsd
@@ -26,4 +29,4 @@ script:
 - go test -i $EXCLUDE_VENDOR
 - if [[ "$TRAVIS_GO_VERSION" =~ 1.12 ]]; then ./scripts/cov.sh TRAVIS; else go test -failfast $EXCLUDE_VENDOR; fi
 after_success:
-- if [[ "$TRAVIS_GO_VERSION" =~ 1.12 ]] && [ "$TRAVIS_TAG" != "" ]; then ./scripts/cross_compile.sh $TRAVIS_TAG; ghr --owner nats-io --token $GITHUB_TOKEN --draft --replace $TRAVIS_TAG pkg/; fi
+- if [[ "$TRAVIS_GO_VERSION" =~ 1.11 ]] && [ "$TRAVIS_TAG" != "" ]; then ./scripts/cross_compile.sh $TRAVIS_TAG; ghr --owner nats-io --token $GITHUB_TOKEN --draft --replace $TRAVIS_TAG pkg/; fi
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.11.9
+FROM golang:1.11.10
 
 MAINTAINER Ivan Kozlovic <ivan@synadia.com>
 
@@ -10,11 +10,11 @@ WORKDIR /go/src/github.com/nats-io/nats-streaming-server
 # vendor/manifest file.
 ARG NATS_GIT_COMMIT='github.com/nats-io/nats-streaming-server/vendor/github.com/nats-io/gnatsd/server.gitCommit=3e64f0b'
 
-RUN CGO_ENABLED=0 GOOS=linux   GOARCH=amd64         go build -v -a -tags netgo -installsuffix netgo -ldflags "-s -w -X github.com/nats-io/nats-streaming-server/server.gitCommit=`git rev-parse --short HEAD` -X ${NATS_GIT_COMMIT}" -o pkg/linux-amd64/nats-streaming-server
-RUN CGO_ENABLED=0 GOOS=linux   GOARCH=arm   GOARM=6 go build -v -a -tags netgo -installsuffix netgo -ldflags "-s -w -X github.com/nats-io/nats-streaming-server/server.gitCommit=`git rev-parse --short HEAD` -X ${NATS_GIT_COMMIT}" -o pkg/linux-arm6/nats-streaming-server
-RUN CGO_ENABLED=0 GOOS=linux   GOARCH=arm   GOARM=7 go build -v -a -tags netgo -installsuffix netgo -ldflags "-s -w -X github.com/nats-io/nats-streaming-server/server.gitCommit=`git rev-parse --short HEAD` -X ${NATS_GIT_COMMIT}" -o pkg/linux-arm7/nats-streaming-server
-RUN CGO_ENABLED=0 GOOS=linux   GOARCH=arm64         go build -v -a -tags netgo -installsuffix netgo -ldflags "-s -w -X github.com/nats-io/nats-streaming-server/server.gitCommit=`git rev-parse --short HEAD` -X ${NATS_GIT_COMMIT}" -o pkg/linux-arm64/nats-streaming-server
-RUN CGO_ENABLED=0 GOOS=windows GOARCH=amd64         go build -v -a -tags netgo -installsuffix netgo -ldflags "-s -w -X github.com/nats-io/nats-streaming-server/server.gitCommit=`git rev-parse --short HEAD` -X ${NATS_GIT_COMMIT}" -o pkg/win-amd64/nats-streaming-server.exe
+RUN CGO_ENABLED=0 GO111MODULE=off GOOS=linux   GOARCH=amd64         go build -v -a -tags netgo -installsuffix netgo -ldflags "-s -w -X github.com/nats-io/nats-streaming-server/server.gitCommit=`git rev-parse --short HEAD` -X ${NATS_GIT_COMMIT}" -o pkg/linux-amd64/nats-streaming-server
+RUN CGO_ENABLED=0 GO111MODULE=off GOOS=linux   GOARCH=arm   GOARM=6 go build -v -a -tags netgo -installsuffix netgo -ldflags "-s -w -X github.com/nats-io/nats-streaming-server/server.gitCommit=`git rev-parse --short HEAD` -X ${NATS_GIT_COMMIT}" -o pkg/linux-arm6/nats-streaming-server
+RUN CGO_ENABLED=0 GO111MODULE=off GOOS=linux   GOARCH=arm   GOARM=7 go build -v -a -tags netgo -installsuffix netgo -ldflags "-s -w -X github.com/nats-io/nats-streaming-server/server.gitCommit=`git rev-parse --short HEAD` -X ${NATS_GIT_COMMIT}" -o pkg/linux-arm7/nats-streaming-server
+RUN CGO_ENABLED=0 GO111MODULE=off GOOS=linux   GOARCH=arm64         go build -v -a -tags netgo -installsuffix netgo -ldflags "-s -w -X github.com/nats-io/nats-streaming-server/server.gitCommit=`git rev-parse --short HEAD` -X ${NATS_GIT_COMMIT}" -o pkg/linux-arm64/nats-streaming-server
+RUN CGO_ENABLED=0 GO111MODULE=off GOOS=windows GOARCH=amd64         go build -v -a -tags netgo -installsuffix netgo -ldflags "-s -w -X github.com/nats-io/nats-streaming-server/server.gitCommit=`git rev-parse --short HEAD` -X ${NATS_GIT_COMMIT}" -o pkg/win-amd64/nats-streaming-server.exe
 
 ENTRYPOINT ["go"]
 CMD ["version"]
diff --git a/README.md b/README.md
@@ -825,13 +825,13 @@ various general statistics.
 ```
 {
   "cluster_id": "test-cluster",
-  "server_id": "6U4KtjiZTmc5tbk2VJsnwW",
-  "version": "0.14.1",
-  "go": "go1.11.9",
+  "server_id": "JEzjfVQS4JIEzM7lZmWHm9",
+  "version": "0.14.2",
+  "go": "go1.11.10",
   "state": "STANDALONE",
-  "now": "2019-04-23T19:57:49.816691-06:00",
-  "start_time": "2019-04-23T19:57:47.920168-06:00",
-  "uptime": "1s",
+  "now": "2019-05-21T11:09:35.364637-06:00",
+  "start_time": "2019-05-21T11:09:24.204869-06:00",
+  "uptime": "11s",
   "clients": 0,
   "subscriptions": 0,
   "channels": 0,
@@ -845,14 +845,14 @@ Here is an example:
 ```
 {
   "cluster_id": "test-cluster",
-  "server_id": "6QXPWQ1krx6XTBx5fLcvwY",
-  "version": "0.14.1",
-  "go": "go1.11.9",
+  "server_id": "t9W9zbOIIi5Y9Guppxl0lF",
+  "version": "0.14.2",
+  "go": "go1.11.10",
   "state": "CLUSTERED",
-  "role": "Leader",
-  "now": "2019-04-23T19:58:18.337411-06:00",
-  "start_time": "2019-04-23T19:58:14.051974-06:00",
-  "uptime": "4s",
+  "role": "Follower",
+  "now": "2019-05-21T11:10:15.765261-06:00",
+  "start_time": "2019-05-21T11:10:12.21284-06:00",
+  "uptime": "3s",
   "clients": 0,
   "subscriptions": 0,
   "channels": 0,
@@ -1174,26 +1174,26 @@ The NATS Streaming Server embeds a NATS Server. Starting the server with no argu
 
 ```
 > ./nats-streaming-server
-[40176] 2019/04/23 19:57:13.255548 [INF] STREAM: Starting nats-streaming-server[test-cluster] version 0.14.1
-[40176] 2019/04/23 19:57:13.255708 [INF] STREAM: ServerID: 1YXCKvEKwKAzr3D7E5VOoq
-[40176] 2019/04/23 19:57:13.255725 [INF] STREAM: Go version: go1.11.9
-[40176] 2019/04/23 19:57:13.255727 [INF] STREAM: Git commit: [not set]
-[40176] 2019/04/23 19:57:13.256217 [INF] Starting nats-server version 1.4.1
-[40176] 2019/04/23 19:57:13.256223 [INF] Git commit [not set]
-[40176] 2019/04/23 19:57:13.256450 [INF] Listening for client connections on 0.0.0.0:4222
-[40176] 2019/04/23 19:57:13.256455 [INF] Server is ready
-[40176] 2019/04/23 19:57:13.288526 [INF] STREAM: Recovering the state...
-[40176] 2019/04/23 19:57:13.288549 [INF] STREAM: No recovered state
-[40176] 2019/04/23 19:57:13.540230 [INF] STREAM: Message store is MEMORY
-[40176] 2019/04/23 19:57:13.540290 [INF] STREAM: ---------- Store Limits ----------
-[40176] 2019/04/23 19:57:13.540296 [INF] STREAM: Channels:                  100 *
-[40176] 2019/04/23 19:57:13.540300 [INF] STREAM: --------- Channels Limits --------
-[40176] 2019/04/23 19:57:13.540303 [INF] STREAM:   Subscriptions:          1000 *
-[40176] 2019/04/23 19:57:13.540307 [INF] STREAM:   Messages     :       1000000 *
-[40176] 2019/04/23 19:57:13.540310 [INF] STREAM:   Bytes        :     976.56 MB *
-[40176] 2019/04/23 19:57:13.540314 [INF] STREAM:   Age          :     unlimited *
-[40176] 2019/04/23 19:57:13.540317 [INF] STREAM:   Inactivity   :     unlimited *
-[40176] 2019/04/23 19:57:13.540321 [INF] STREAM: ----------------------------------
+[78166] 2019/05/21 11:11:55.176519 [INF] STREAM: Starting nats-streaming-server[test-cluster] version 0.14.2
+[78166] 2019/05/21 11:11:55.176607 [INF] STREAM: ServerID: Zea1oL1PCvdcPAjWYYI65l
+[78166] 2019/05/21 11:11:55.176610 [INF] STREAM: Go version: go1.11.10
+[78166] 2019/05/21 11:11:55.176612 [INF] STREAM: Git commit: [not set]
+[78166] 2019/05/21 11:11:55.177090 [INF] Starting nats-server version 1.4.1
+[78166] 2019/05/21 11:11:55.177096 [INF] Git commit [not set]
+[78166] 2019/05/21 11:11:55.177274 [INF] Listening for client connections on 0.0.0.0:4222
+[78166] 2019/05/21 11:11:55.177278 [INF] Server is ready
+[78166] 2019/05/21 11:11:55.205993 [INF] STREAM: Recovering the state...
+[78166] 2019/05/21 11:11:55.206010 [INF] STREAM: No recovered state
+[78166] 2019/05/21 11:11:55.457928 [INF] STREAM: Message store is MEMORY
+[78166] 2019/05/21 11:11:55.457987 [INF] STREAM: ---------- Store Limits ----------
+[78166] 2019/05/21 11:11:55.457990 [INF] STREAM: Channels:                  100 *
+[78166] 2019/05/21 11:11:55.457992 [INF] STREAM: --------- Channels Limits --------
+[78166] 2019/05/21 11:11:55.458008 [INF] STREAM:   Subscriptions:          1000 *
+[78166] 2019/05/21 11:11:55.458010 [INF] STREAM:   Messages     :       1000000 *
+[78166] 2019/05/21 11:11:55.458012 [INF] STREAM:   Bytes        :     976.56 MB *
+[78166] 2019/05/21 11:11:55.458014 [INF] STREAM:   Age          :     unlimited *
+[78166] 2019/05/21 11:11:55.458016 [INF] STREAM:   Inactivity   :     unlimited *
+[78166] 2019/05/21 11:11:55.458034 [INF] STREAM: ----------------------------------
 ```
 
 The server will be started and listening for client connections on port 4222 (the default) from all available interfaces. The logs will be displayed to stderr as shown above.
@@ -1770,9 +1770,9 @@ Below is what would be displayed with the above store limits configuration. Noti
 how `foo.bar.>` is indented compared to `foo.>` to show the inheritance.
 
 ```
-[INF] STREAM: Starting nats-streaming-server[test-cluster] version 0.14.1
-[INF] STREAM: ServerID: qJXDf3guA7es2zhBzCoT6I
-[INF] STREAM: Go version: go1.11.9
+[INF] STREAM: Starting nats-streaming-server[test-cluster] version 0.14.2
+[INF] STREAM: ServerID: XStGXeAQhMgPpp4kXg5HNO
+[INF] STREAM: Go version: go1.11.10
 [INF] STREAM: Git commit: [not set]
 [INF] Starting nats-server version 1.4.1
 [INF] Git commit [not set]
@@ -2039,12 +2039,7 @@ if you want to ensure that each operation is immediately committed to the databa
 
 ## Clients
 
-Here is the list of NATS Streaming clients, supported by Synadia. We may add additional supported streaming clients in the future, and encourage community-contributed clients.
-
-- [C#](https://github.com/nats-io/csharp-nats-streaming)
-- [Go](https://github.com/nats-io/go-nats-streaming)
-- [Java](https://github.com/nats-io/java-nats-streaming)
-- [Node.js](https://github.com/nats-io/node-nats-streaming)
+You can find [here](https://nats.io/download/) the list of NATS Streaming clients supported by Synadia. There are also links to community-contributed clients.
 
 ## License
 

diff --git a/server/server.go b/server/server.go
@@ -47,7 +47,7 @@ import (
 // Server defaults.
 const (
 	// VERSION is the current version for the NATS Streaming server.
-	VERSION = "0.14.1"
+	VERSION = "0.14.2"
 
 	DefaultClusterID      = "test-cluster"
 	DefaultDiscoverPrefix = "_STAN.discover"