mirror/opencloud
1
0
Fork 0
mirror of https://github.com/opencloud-eu/opencloud.git synced 2026-05-03 17:29:22 -05:00
Code Issues Packages Projects Releases Wiki Activity

runtime: removed trap goroutine and let the context cancelation do the thing

Browse Source
This commit is contained in:
A.Unger
2021-12-06 12:11:48 +01:00
parent 771b870753
commit e3e3d1ee57
15 changed files with 4 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ocis/pkg/runtime/cmd/run.go
+2 -1
View File
@@ -22,7 +22,8 @@ func Run(cfg *config.Config) *cobra.Command {
log.Fatal("dialing:", err)
}
var res int
if err := client.Call("Service.Start", &args[0], &res); err != nil {
if err = client.Call("Service.Start", &args[0], &res); err != nil {
log.Fatal(err)
}
ocis/pkg/runtime/service/service.go
+2 -10
View File
@@ -137,9 +137,6 @@ func Start(o ...Option) error {
halt := make(chan os.Signal, 1)
signal.Notify(halt, syscall.SIGINT, syscall.SIGTERM, syscall.SIGQUIT, syscall.SIGHUP)
// notify goroutines that they are running on supervised mode
s.cfg.Mode = ociscfg.SUPERVISED
setMicroLogger()
// tolerance controls backoff cycles from the supervisor.
@@ -191,7 +188,7 @@ func Start(o ...Option) error {
defer func() {
if r := recover(); r != nil {
reason := strings.Builder{}
if _, err := net.Dial("tcp", net.JoinHostPort(s.cfg.Runtime.Host, s.cfg.Runtime.Port)); err != nil {
if _, err = net.Dial("tcp", net.JoinHostPort(s.cfg.Runtime.Host, s.cfg.Runtime.Port)); err != nil {
reason.WriteString("runtime address already in use")
}
@@ -256,11 +253,6 @@ func (s *Service) generateRunSet(cfg *config.Config) {
// Start indicates the Service Controller to start a new supervised service as an OS thread.
func (s *Service) Start(name string, reply *int) error {
// RPC calls to a Service object will allow for parsing config. Mind that since the runtime is running on a different
// machine, the configuration needs to be present in the given machine. RPC does not yet allow providing a config
// during transport.
s.cfg.Mode = ociscfg.UNSUPERVISED
swap := deepcopy.Copy(s.cfg)
if _, ok := s.ServicesRegistry[name]; ok {
*reply = 0
@@ -306,7 +298,7 @@ func (s *Service) List(args struct{}, reply *string) error {
func (s *Service) Kill(name string, reply *int) error {
if len(s.serviceToken[name]) > 0 {
for i := range s.serviceToken[name] {
if err := s.Supervisor.Remove(s.serviceToken[name][i]); err != nil {
if err := s.Supervisor.RemoveAndWait(s.serviceToken[name][i], 5000*time.Millisecond); err != nil {
return err
}
}