From 36e96c5bf1b104650bd2a43c7e7d7995964df933 Mon Sep 17 00:00:00 2001
From: Zach Ramsay <zach.ramsay@gmail.com>
Date: Thu, 21 Sep 2017 15:32:06 -0400
Subject: [PATCH] linting: catch some errors

---
 Makefile                | 2 +-
 client/grpc_client.go   | 4 +++-
 client/socket_client.go | 4 +++-
 server/grpc_server.go   | 4 +++-
 server/socket_server.go | 4 +++-
 5 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index cbdc66e1..13f5dae7 100644
--- a/Makefile
+++ b/Makefile
@@ -58,6 +58,7 @@ metalinter: tools
 metalinter_test: tools
 	@gometalinter --install
 	gometalinter --vendor --deadline=600s --disable-all  \
+		--enable=aligncheck \
 		--enable=deadcode \
 		--enable=gas \
 		--enable=goimports \
@@ -70,7 +71,6 @@ metalinter_test: tools
 	   	--enable=varcheck \
 		./...
 
-		#--enable=aligncheck \
 		#--enable=dupl \
 		#--enable=errcheck \
 		#--enable=goconst \
diff --git a/client/grpc_client.go b/client/grpc_client.go
index e9a74026..31ca3db2 100644
--- a/client/grpc_client.go
+++ b/client/grpc_client.go
@@ -41,7 +41,9 @@ func dialerFunc(addr string, timeout time.Duration) (net.Conn, error) {
 }
 
 func (cli *grpcClient) OnStart() error {
-	cli.BaseService.OnStart()
+	if err := cli.BaseService.OnStart(); err != nil {
+		return err
+	}
 RETRY_LOOP:
 
 	for {
diff --git a/client/socket_client.go b/client/socket_client.go
index 74df9326..4c7265cd 100644
--- a/client/socket_client.go
+++ b/client/socket_client.go
@@ -57,7 +57,9 @@ func NewSocketClient(addr string, mustConnect bool) *socketClient {
 }
 
 func (cli *socketClient) OnStart() error {
-	cli.BaseService.OnStart()
+	if err := cli.BaseService.OnStart(); err != nil {
+		return err
+	}
 
 	var err error
 	var conn net.Conn
diff --git a/server/grpc_server.go b/server/grpc_server.go
index 90346d69..ac3d728a 100644
--- a/server/grpc_server.go
+++ b/server/grpc_server.go
@@ -37,7 +37,9 @@ func NewGRPCServer(protoAddr string, app types.ABCIApplicationServer) cmn.Servic
 
 // OnStart starts the gRPC service
 func (s *GRPCServer) OnStart() error {
-	s.BaseService.OnStart()
+	if err := s.BaseService.OnStart(); err != nil {
+		return err
+	}
 	ln, err := net.Listen(s.proto, s.addr)
 	if err != nil {
 		return err
diff --git a/server/socket_server.go b/server/socket_server.go
index 88011a05..4b64a5f0 100644
--- a/server/socket_server.go
+++ b/server/socket_server.go
@@ -44,7 +44,9 @@ func NewSocketServer(protoAddr string, app types.Application) cmn.Service {
 }
 
 func (s *SocketServer) OnStart() error {
-	s.BaseService.OnStart()
+	if err := s.BaseService.OnStart(); err != nil {
+		return err
+	}
 	ln, err := net.Listen(s.proto, s.addr)
 	if err != nil {
 		return err