Merge pull request #121 from cmfatih/master

Fix port (client) and cluster port information for varz route

README.md

@@ -1,8 +1,6 @@
 # gnatsd
-[![License MIT](https://img.shields.io/npm/l/express.svg)](http://opensource.org/licenses/MIT)
-[![Build Status](https://travis-ci.org/nats-io/gnatsd.svg?branch=master)](http://travis-ci.org/nats-io/gnatsd)
-[![Current Release](http://img.shields.io/badge/release-v0.6.6-1eb0fc.svg)](https://github.com/nats-io/gnatsd/releases/tag/v0.6.6)
-[![Coverage Status](https://img.shields.io/coveralls/nats-io/gnatsd.svg)](https://coveralls.io/r/nats-io/gnatsd?branch=master)
+
+[![License][License-Image]][License-Url] [![Build][Build-Status-Image]][Build-Status-Url] [![Release][Release-Image]][Release-Url] [![Coverage][Coverage-Image]][Coverage-Url]
 
 A High Performance [NATS](https://nats.io) Server written in [Go.](http://golang.org)
 
@@ -164,7 +162,7 @@ You can also report detailed subscription information on a per connection basis
       "cid": 571,
       "ip": "127.0.0.1",
       "port": 61572,
-      "pending_size": 0,
+      "pending_bytes": 0,
       "in_msgs": 0,
       "out_msgs": 0,
       "in_bytes": 0,
@@ -180,7 +178,7 @@ You can also report detailed subscription information on a per connection basis
       "cid": 574,
       "ip": "127.0.0.1",
       "port": 61577,
-      "pending_size": 0,
+      "pending_bytes": 0,
       "in_msgs": 0,
       "out_msgs": 0,
       "in_bytes": 0,
@@ -313,3 +311,12 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 IN THE SOFTWARE.
+
+[License-Url]: http://opensource.org/licenses/MIT
+[License-Image]: https://img.shields.io/npm/l/express.svg
+[Build-Status-Url]: http://travis-ci.org/nats-io/gnatsd
+[Build-Status-Image]: https://travis-ci.org/nats-io/gnatsd.svg?branch=master
+[Release-Url]: https://github.com/nats-io/gnatsd/releases/tag/v0.6.8
+[Release-image]: http://img.shields.io/badge/release-v0.6.8-1eb0fc.svg
+[Coverage-Url]: https://coveralls.io/r/nats-io/gnatsd?branch=master
+[Coverage-image]: https://img.shields.io/coveralls/nats-io/gnatsd.svg

server/monitor.go

@@ -245,6 +245,7 @@ func (s *Server) HandleSubsz(w http.ResponseWriter, r *http.Request) {
 type Varz struct {
 	*Info
 	*Options
+	Port          int       `json:"port"`
 	MaxPayload    int       `json:"max_payload"`
 	Start         time.Time `json:"start"`
 	Now           time.Time `json:"now"`
@@ -310,6 +311,7 @@ func (s *Server) HandleVarz(w http.ResponseWriter, r *http.Request) {
 	v := &Varz{Info: &s.info, Options: s.opts, MaxPayload: s.opts.MaxPayload, Start: s.start}
 	v.Now = time.Now()
 	v.Uptime = myUptime(time.Since(s.start))
+	v.Port = v.Info.Port
 
 	updateUsage(v)
 

server/opts.go

@@ -36,7 +36,7 @@ type Options struct {
 	MaxPayload         int           `json:"max_payload"`
 	MaxPending         int           `json:"max_pending_size"`
 	ClusterHost        string        `json:"addr"`
-	ClusterPort        int           `json:"port"`
+	ClusterPort        int           `json:"cluster_port"`
 	ClusterUsername    string        `json:"-"`
 	ClusterPassword    string        `json:"-"`
 	ClusterAuthTimeout float64       `json:"auth_timeout"`