Merge pull request #35 from spiral/feature/standalone-usage

- added the ability to work on Golang level only (without roadrunner …

Author: wolfy-j

CHANGELOG.md

@@ -1,6 +1,14 @@
 CHANGELOG
 =========
 
+v1.2.0 (27.01.2020)
+-------------------
+- added the ability to work on Golang level only (without roadrunner worker and proto file)
+
+v1.1.1 (27.01.2020)
+-------------------
+- [bugfix] invalid constructor parameters in ServiceException by @everflux
+
 v1.1.0 (30.11.2019)
 -------------------
 - added automatic CS fixing

build.sh

@@ -2,7 +2,7 @@
 cd $(dirname "${BASH_SOURCE[0]}")
 OD="$(pwd)"
 # Pushes application version into the build information.
-RR_VERSION=1.1.0
+RR_VERSION=1.2.0
 
 # Hardcode some values to the core package
 LDFLAGS="$LDFLAGS -X github.com/spiral/roadrunner/cmd/rr/cmd.Version=${RR_VERSION}"

config.go

@@ -37,11 +37,9 @@ type TLS struct {
 
 // Hydrate the config and validate it's values.
 func (c *Config) Hydrate(cfg service.Config) error {
-	if c.Workers == nil {
-		c.Workers = &roadrunner.ServerConfig{}
-	}
-
+	c.Workers = &roadrunner.ServerConfig{}
 	c.Workers.InitDefaults()
+
 	if err := cfg.Unmarshal(c); err != nil {
 		return err
 	}
@@ -52,20 +50,25 @@ func (c *Config) Hydrate(cfg service.Config) error {
 
 // Valid validates the configuration.
 func (c *Config) Valid() error {
-	if c.Proto == "" {
+	if c.Proto == "" && c.Workers.Command != "" {
+		// only when rr server is set
 		return errors.New("proto file is required")
 	}
 
-	if _, err := os.Stat(c.Proto); err != nil {
-		if os.IsNotExist(err) {
-			return fmt.Errorf("proto file '%s' does not exists", c.Proto)
-		}
+	if c.Proto != "" {
+		if _, err := os.Stat(c.Proto); err != nil {
+			if os.IsNotExist(err) {
+				return fmt.Errorf("proto file '%s' does not exists", c.Proto)
+			}
 
-		return err
+			return err
+		}
 	}
 
-	if err := c.Workers.Pool.Valid(); err != nil {
-		return err
+	if c.Workers.Command != "" {
+		if err := c.Workers.Pool.Valid(); err != nil {
+			return err
+		}
 	}
 
 	if !strings.Contains(c.Listen, ":") {

go.mod

@@ -8,7 +8,7 @@ require (
 	github.com/prometheus/client_golang v1.0.0
 	github.com/sirupsen/logrus v1.3.0
 	github.com/spf13/cobra v0.0.3
-	github.com/spiral/roadrunner v1.4.8
+	github.com/spiral/roadrunner v1.5.3
 	github.com/stretchr/testify v1.3.0
 	golang.org/x/net v0.0.0-20181114220301-adae6a3d119a
 	google.golang.org/grpc v1.18.0

service.go

@@ -63,47 +63,55 @@ func (svc *Service) Init(cfg *Config, r *rpc.Service, e env.Environment) (ok boo
 		}
 	}
 
+	if svc.cfg.Workers.Command != "" {
+		svc.rr = roadrunner.NewServer(svc.cfg.Workers)
+	}
+
 	return true, nil
 }
 
 // Serve GRPC grpc.
 func (svc *Service) Serve() (err error) {
 	svc.mu.Lock()
 
-	if svc.env != nil {
-		if err := svc.env.Copy(svc.cfg.Workers); err != nil {
-			return err
-		}
-	}
-
-	svc.cfg.Workers.SetEnv("RR_GRPC", "true")
-
-	svc.rr = roadrunner.NewServer(svc.cfg.Workers)
-	svc.rr.Listen(svc.throw)
-
-	if svc.cr != nil {
-		svc.rr.Attach(svc.cr)
-	}
-
 	if svc.grpc, err = svc.createGPRCServer(); err != nil {
+		svc.mu.Unlock()
 		return err
 	}
 
-	lis, err := svc.cfg.Listener()
+	ls, err := svc.cfg.Listener()
 	if err != nil {
+		svc.mu.Unlock()
 		return err
 	}
+	defer ls.Close()
+
+	if svc.rr != nil {
+		if svc.env != nil {
+			if err := svc.env.Copy(svc.cfg.Workers); err != nil {
+				svc.mu.Unlock()
+				return err
+			}
+		}
 
-	defer lis.Close()
+		svc.cfg.Workers.SetEnv("RR_GRPC", "true")
 
-	svc.mu.Unlock()
+		svc.rr.Listen(svc.throw)
 
-	if err := svc.rr.Start(); err != nil {
-		return err
+		if svc.cr != nil {
+			svc.rr.Attach(svc.cr)
+		}
+
+		if err := svc.rr.Start(); err != nil {
+			svc.mu.Unlock()
+			return err
+		}
+		defer svc.rr.Stop()
 	}
-	defer svc.rr.Stop()
 
-	return svc.grpc.Serve(lis)
+	svc.mu.Unlock()
+
+	return svc.grpc.Serve(ls)
 }
 
 // Stop the service.
@@ -167,22 +175,24 @@ func (svc *Service) createGPRCServer() (*grpc.Server, error) {
 
 	server := grpc.NewServer(opts...)
 
-	// php proxy services
-	services, err := parser.File(svc.cfg.Proto, path.Dir(svc.cfg.Proto))
-	if err != nil {
-		return nil, err
-	}
-
-	for _, service := range services {
-		p := NewProxy(fmt.Sprintf("%s.%s", service.Package, service.Name), svc.cfg.Proto, svc.rr)
-		for _, m := range service.Methods {
-			p.RegisterMethod(m.Name)
+	if svc.cfg.Proto != "" && svc.rr != nil {
+		// php proxy services
+		services, err := parser.File(svc.cfg.Proto, path.Dir(svc.cfg.Proto))
+		if err != nil {
+			return nil, err
 		}
 
-		server.RegisterService(p.ServiceDesc(), p)
+		for _, service := range services {
+			p := NewProxy(fmt.Sprintf("%s.%s", service.Package, service.Name), svc.cfg.Proto, svc.rr)
+			for _, m := range service.Methods {
+				p.RegisterMethod(m.Name)
+			}
+
+			server.RegisterService(p.ServiceDesc(), p)
+		}
 	}
 
-	// external services
+	// external and native  services
 	for _, r := range svc.services {
 		r(server)
 	}