Merge pull request #3740 from wkloucek/remove-run-kill-runtime

remove run and kill commands from the runtime

changelog/unreleased/change-remove-runtime-kill-run-commands.md

@@ -0,0 +1,10 @@
+Bugfix: Remove runtime kill and run commands
+
+We've removed the kill and run commands from the oCIS runtime.
+If these dynamic capabilities are needed, one should switch to a full fledged
+supervisor and start oCIS as individual services.
+
+If one wants to start a only a subset of services, this is still possible
+by setting OCIS_RUN_EXTENSIONS.
+
+https://github.com/owncloud/ocis/pull/3740

docs/ocis/getting-started/_index.md

@@ -112,16 +112,6 @@ The list command prints all running oCIS extensions.
 ocis list
 {{< / highlight >}}
 
-To stop a particular extension:
-{{< highlight txt >}}
-ocis kill web
-{{< / highlight >}}
-
-To start a particular extension:
-{{< highlight txt >}}
-ocis run web
-{{< / highlight >}}
-
 The version command prints the version of your installed oCIS.
 {{< highlight txt >}}
 ocis --version

ocis/pkg/runtime/service/service.go

@@ -274,25 +274,6 @@ func (s *Service) generateRunSet(cfg *ociscfg.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 {
-	swap := deepcopy.Copy(s.cfg)
-	if _, ok := s.ServicesRegistry[name]; ok {
-		*reply = 0
-		s.serviceToken[name] = append(s.serviceToken[name], s.Supervisor.Add(s.ServicesRegistry[name](swap.(*ociscfg.Config))))
-		return nil
-	}
-
-	if _, ok := s.Delayed[name]; ok {
-		*reply = 0
-		s.serviceToken[name] = append(s.serviceToken[name], s.Supervisor.Add(s.Delayed[name](swap.(*ociscfg.Config))))
-		return nil
-	}
-
-	*reply = 0
-	return fmt.Errorf("cannot start service %s: unknown service", name)
-}
-
 // List running processes for the Service Controller.
 func (s *Service) List(args struct{}, reply *string) error {
 	tableString := &strings.Builder{}
@@ -317,22 +298,6 @@ func (s *Service) List(args struct{}, reply *string) error {
 	return nil
 }
 
-// Kill a supervised process by subcommand name.
-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.RemoveAndWait(s.serviceToken[name][i], 5000*time.Millisecond); err != nil {
-				return err
-			}
-		}
-		delete(s.serviceToken, name)
-	} else {
-		return fmt.Errorf("service %s not found", name)
-	}
-
-	return nil
-}
-
 // trap blocks on halt channel. When the runtime is interrupted it
 // signals the controller to stop any supervised process.
 func trap(s *Service, halt chan os.Signal) {