go.mod

@@ -5,7 +5,7 @@ go 1.20
 require (
 	github.com/roadrunner-server/errors v1.2.0
 	github.com/stretchr/testify v1.8.1
-	golang.org/x/exp v0.0.0-20230203172020-98cc5a0785f9
+	golang.org/x/exp v0.0.0-20230206171751-46f607a40771
 )
 
 require (

go.sum

@@ -14,6 +14,8 @@ github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKs
 github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
 golang.org/x/exp v0.0.0-20230203172020-98cc5a0785f9 h1:frX3nT9RkKybPnjyI+yvZh6ZucTZatCCEm9D47sZ2zo=
 golang.org/x/exp v0.0.0-20230203172020-98cc5a0785f9/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc=
+golang.org/x/exp v0.0.0-20230206171751-46f607a40771 h1:xP7rWLUr1e1n2xkK5YB4LI0hPEy3LJC6Wk+D4pGlOJg=
+golang.org/x/exp v0.0.0-20230206171751-46f607a40771/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

go.work.sum

@@ -1,3 +1,4 @@
 github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 golang.org/x/mod v0.6.0/go.mod h1:4mET923SAdbXp2ki8ey+zGs1SLqsuM2Y0uvdZR/fUNI=
+golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/tools v0.2.0/go.mod h1:y4OqIKeOV/fWJetJ8bXPU1sEVniLMIyDAZWeHdV+NTA=

serve.go

@@ -2,7 +2,9 @@ package endure
 
 import (
 	"reflect"
+	"sort"
 
+	"github.com/roadrunner-server/endure/v2/graph"
 	"github.com/roadrunner-server/errors"
 	"golang.org/x/exp/slog"
 )
@@ -12,44 +14,51 @@ func (e *Endure) serve() error {
 		topological order
 	*/
 	vertices := e.graph.TopologicalOrder()
+	serveVertices := make([]*graph.Vertex, len(vertices))
+	copy(serveVertices, vertices)
 
-	if len(vertices) == 0 {
+	sort.Slice(serveVertices, func(i, j int) bool {
+		return serveVertices[i].Weight() > serveVertices[j].Weight()
+	})
+
+	if len(serveVertices) == 0 {
 		return errors.E(errors.Str("error occurred, nothing to run"))
 	}
 
-	for i := 0; i < len(vertices); i++ {
-		if !vertices[i].IsActive() {
+	for i := 0; i < len(serveVertices); i++ {
+		if !serveVertices[i].IsActive() {
 			continue
 		}
 
-		if !reflect.TypeOf(vertices[i].Plugin()).Implements(reflect.TypeOf((*Service)(nil)).Elem()) {
+		if !reflect.TypeOf(serveVertices[i].Plugin()).Implements(reflect.TypeOf((*Service)(nil)).Elem()) {
 			continue
 		}
 
-		serveMethod, _ := reflect.TypeOf(vertices[i].Plugin()).MethodByName(ServeMethodName)
+		serveMethod, _ := reflect.TypeOf(serveVertices[i].Plugin()).MethodByName(ServeMethodName)
 
 		var inVals []reflect.Value
-		inVals = append(inVals, reflect.ValueOf(vertices[i].Plugin()))
+		inVals = append(inVals, reflect.ValueOf(serveVertices[i].Plugin()))
 
-		e.log.Debug("calling serve method", slog.String("plugin", vertices[i].ID().String()))
+		e.log.Debug("calling serve method", slog.String("plugin", serveVertices[i].ID().String()))
 
 		ret := serveMethod.Func.Call(inVals)[0].Interface()
 		if ret != nil {
 			if err, ok := ret.(chan error); ok && err != nil {
-				// error come right after we start serving the vrtx
+				// error come right after we start serving the vertex
 				if len(err) > 0 {
 					// read the error
 					err := <-err
 					return errors.E(
 						errors.FunctionCall,
-						errors.Errorf("got initial serve error from the Vertex %s, stopping execution, error: %v",
-							vertices[i].ID().String(), err),
+						errors.Errorf(
+							"got initial serve error from the Vertex %s, stopping execution, error: %v",
+							serveVertices[i].ID().String(), err),
 					)
 				}
 				e.poll(&result{
 					errCh:    err,
 					signal:   make(chan notify),
-					vertexID: vertices[i].ID().String(),
+					vertexID: serveVertices[i].ID().String(),
 				})
 			}
 		}