From 462108b51ef7c4111ac980185bfd350503adff77 Mon Sep 17 00:00:00 2001 From: Nicolas Mahe Date: Thu, 20 Sep 2018 11:45:58 +0700 Subject: [PATCH] Update service.ListRunning function to only return services for a specific core base on its name --- service/start.go | 1 + service/status.go | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/service/start.go b/service/start.go index 000384f1f..df79f1eb6 100644 --- a/service/start.go +++ b/service/start.go @@ -74,6 +74,7 @@ func (d *Dependency) Start(networkID string) (containerServiceID string, err err Labels: map[string]string{ "mesg.service": d.service.Name, "mesg.hash": d.service.ID, + "mesg.core": c.Core.Name, }, Image: d.Image, Args: strings.Fields(d.Command), diff --git a/service/status.go b/service/status.go index d1bb9e68d..a46a42662 100644 --- a/service/status.go +++ b/service/status.go @@ -1,6 +1,7 @@ package service import ( + "github.com/mesg-foundation/core/config" "github.com/mesg-foundation/core/container" ) @@ -70,10 +71,15 @@ func (d *Dependency) Status() (container.StatusType, error) { // ListRunning returns all the running services.2 // TODO: should move to another file func ListRunning() ([]string, error) { - services, err := defaultContainer.ListServices("mesg.hash") + c, err := config.Global() if err != nil { return nil, err } + services, err := defaultContainer.ListServices("mesg.hash", "mesg.core="+c.Core.Name) + if err != nil { + return nil, err + } + // Make service list unique. One mesg service can have multiple docker service. mapRes := make(map[string]uint) for _, service := range services { serviceName := service.Spec.Annotations.Labels["mesg.hash"]