make Core hold *proc.Proc instead of proc.Proc

core.go

@@ -12,7 +12,7 @@ import (
 // Core supports basic process control and interaction.
 type Core struct {
 	sync.RWMutex
-	processes map[uuid.UUID]proc.Proc
+	processes map[uuid.UUID]*proc.Proc
 }
 
 // Start initiates a process.
@@ -32,21 +32,21 @@ func (c *Core) Start(cmd string, args ...string) (uuid.UUID, error) {
 
 // Stop halts a process.
 func (c *Core) Stop(id uuid.UUID) error {
-	var p proc.Proc
+	var p *proc.Proc
 	var err error
 
 	if p, err = c.findProcess(id); err != nil {
 		return c.newError("Stop", err)
 	}
-	if err = p.Kill(); err != nil {
+	if err = p.Stop(); err != nil {
 		return c.newError("Stop", err)
 	}
 	return nil
 }
 
 // Status returns the status of the process.
 func (c *Core) Status(id uuid.UUID) (proc.ProcStatus, error) {
-	var p proc.Proc
+	var p *proc.Proc
 	var err error
 
 	if p, err = c.findProcess(id); err != nil {
@@ -58,7 +58,7 @@ func (c *Core) Status(id uuid.UUID) (proc.ProcStatus, error) {
 
 // Query streams the output/result of a process.
 func (c *Core) Query(id uuid.UUID) (<-chan proc.ProcOutput, error) {
-	var p proc.Proc
+	var p *proc.Proc
 	var err error
 
 	if p, err = c.findProcess(id); err != nil {
@@ -68,12 +68,12 @@ func (c *Core) Query(id uuid.UUID) (<-chan proc.ProcOutput, error) {
 	return p.Query()
 }
 
-func (c *Core) findProcess(id uuid.UUID) (proc.Proc, error) {
+func (c *Core) findProcess(id uuid.UUID) (*proc.Proc, error) {
 	c.RLock()
 	defer c.RUnlock()
 	p, ok := c.processes[id]
 	if !ok {
-		return proc.Proc{}, fmt.Errorf("could not find specified process %v", id)
+		return nil, fmt.Errorf("could not find specified process %v", id)
 	}
 	return p, nil
 }