working commit

app/config/config.go

@@ -36,16 +36,16 @@ type ServiceConfig struct {
 }
 
 type Config struct {
-	PackageVersion string         `json:"packageVersion" yaml:"packageVersion"`
-	Service       ServiceConfig `json:"service"        yaml:"service"`
-	Networks       Networks       `json:"networks"       yaml:"networks"`
-	Hostname       string         `json:"hostname"       yaml:"hostname"`
-	Debug          bool           `json:"debug"          yaml:"debug"`
-	Build          string         `json:"build"          yaml:"build"`
-	LogPath        string         `json:"logfile"        yaml:"logfile"`
-	RunPath        string         `json:"runfile"        yaml:"runfile"`
-	DataDir        string         `json:"datadir"        yaml:"datadir"`
-	Daemon         bool           `json:"daemon"         yaml:"daemon"`
+	PackageVersion string        `json:"packageVersion" yaml:"packageVersion"`
+	Service        ServiceConfig `json:"service"        yaml:"service"`
+	Networks       Networks      `json:"networks"       yaml:"networks"`
+	Hostname       string        `json:"hostname"       yaml:"hostname"`
+	Debug          bool          `json:"debug"          yaml:"debug"`
+	Build          string        `json:"build"          yaml:"build"`
+	LogPath        string        `json:"logfile"        yaml:"logfile"`
+	RunPath        string        `json:"runfile"        yaml:"runfile"`
+	DataDir        string        `json:"datadir"        yaml:"datadir"`
+	Daemon         bool          `json:"daemon"         yaml:"daemon"`
 }
 
 var (

app/handler/handler.go

@@ -2,8 +2,8 @@ package handler
 
 import (
 	"mbase/app/logic"
-	"mbase/pkg/mbctl"
 	"mbase/pkg/logger"
+	"mbase/pkg/mbctl"
 
 	"google.golang.org/grpc"
 )

app/server/server.go

@@ -25,12 +25,12 @@ import (
 )
 
 type Server struct {
-	conf  *config.Config
-	lg    *logic.Logic
+	conf *config.Config
+	lg   *logic.Logic
 	svc  *service.Service
 	hand *handler.Handler
-	log   *logger.Logger
-	nacl  *netacl.NetACL
+	log  *logger.Logger
+	nacl *netacl.NetACL
 
 	db       *database.Database
 	x509cert []byte
@@ -215,7 +215,7 @@ func (srv *Server) Build() error {
 		Logic:    srv.lg,
 		X509Cert: srv.x509cert,
 		X509Key:  srv.x509key,
-                NetACL:   srv.nacl,
+		NetACL:   srv.nacl,
 	}
 	srv.svc = service.NewService(serviceConfig)
 	if err != nil {