Skip to content
This repository has been archived by the owner on Jul 11, 2022. It is now read-only.

Commit

Permalink
rename to service
Browse files Browse the repository at this point in the history
Signed-off-by: Jason McCallister <jason@craftcms.com>
  • Loading branch information
jasonmccallister committed Jul 23, 2020
1 parent a24710c commit 5c2d9bf
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion cmd/nitrod/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ func main() {
}

s := grpc.NewServer()
api.RegisterNitroServiceServer(s, api.NewNitrodServer())
api.RegisterNitroServiceServer(s, api.NewNitrodService())

fmt.Println("running nitrod on port", *port)

Expand Down
10 changes: 5 additions & 5 deletions internal/api/server.go → internal/api/service.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ import (
"github.com/craftcms/nitro/validate"
)

type NitrodServer struct {
type NitrodService struct {
command Runner
logger *log.Logger
}

func (s *NitrodServer) PhpFpmService(ctx context.Context, request *PhpFpmServiceRequest) (*ServiceResponse, error) {
func (s *NitrodService) PhpFpmService(ctx context.Context, request *PhpFpmServiceRequest) (*ServiceResponse, error) {
// validate the request
if err := validate.PHPVersion(request.GetVersion()); err != nil {
s.logger.Println(err)
Expand Down Expand Up @@ -44,7 +44,7 @@ func (s *NitrodServer) PhpFpmService(ctx context.Context, request *PhpFpmService
return &ServiceResponse{Message: "successfully " + message + " php-fpm " + request.GetVersion()}, nil
}

func (s *NitrodServer) NginxService(ctx context.Context, request *NginxServiceRequest) (*ServiceResponse, error) {
func (s *NitrodService) NginxService(ctx context.Context, request *NginxServiceRequest) (*ServiceResponse, error) {
var action string
var message string
switch request.GetAction() {
Expand All @@ -69,8 +69,8 @@ func (s *NitrodServer) NginxService(ctx context.Context, request *NginxServiceRe
return &ServiceResponse{Message: "successfully " + message + " nginx"}, nil
}

func NewNitrodServer() *NitrodServer {
return &NitrodServer{
func NewNitrodService() *NitrodService {
return &NitrodService{
command: &ServiceRunner{},
logger: log.New(os.Stdout, "nitrod ", 0),
}
Expand Down
4 changes: 2 additions & 2 deletions internal/api/server_test.go → internal/api/service_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ func TestNitrodServer_PhpFpmService(t *testing.T) {
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
spy := &spyServiceRunner{}
s := &NitrodServer{
s := &NitrodService{
command: spy,
logger: tt.fields.logger,
}
Expand Down Expand Up @@ -159,7 +159,7 @@ func TestNitrodServer_NginxService(t *testing.T) {
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
spy := &spyServiceRunner{}
s := &NitrodServer{
s := &NitrodService{
command: spy,
logger: tt.fields.logger,
}
Expand Down

0 comments on commit 5c2d9bf

Please # to comment.