Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion main.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,9 @@ package main
import (
"flag"
"fmt"
"github.com/pilu/fresh/runner"
"os"

"github.com/pilu/fresh/runner"
)

func main() {
Expand Down
76 changes: 45 additions & 31 deletions runner/runner.go
Original file line number Diff line number Diff line change
@@ -1,39 +1,53 @@
package runner

import (
"io"
"os/exec"
"flag"
"io"
"os/exec"
"strings"
)

func run() bool {
runnerLog("Running...")

cmd := exec.Command(buildPath())

stderr, err := cmd.StderrPipe()
if err != nil {
fatal(err)
}

stdout, err := cmd.StdoutPipe()
if err != nil {
fatal(err)
}
var cmdArgs string

err = cmd.Start()
if err != nil {
fatal(err)
}

go io.Copy(appLogWriter{}, stderr)
go io.Copy(appLogWriter{}, stdout)

go func() {
<-stopChannel
pid := cmd.Process.Pid
runnerLog("Killing PID %d", pid)
cmd.Process.Kill()
}()
func init() {
flag.StringVar(&cmdArgs, "a", "", "Command line arguments to pass to the process")
}

return true
func run() bool {
runnerLog("Running...")

var cmd *exec.Cmd
if cmdArgs != "" {
args := strings.Split(cmdArgs, " ")
cmd = exec.Command(buildPath(), args...)
} else {
cmd = exec.Command(buildPath())
}

stderr, err := cmd.StderrPipe()
if err != nil {
fatal(err)
}

stdout, err := cmd.StdoutPipe()
if err != nil {
fatal(err)
}

err = cmd.Start()
if err != nil {
fatal(err)
}

go io.Copy(appLogWriter{}, stderr)
go io.Copy(appLogWriter{}, stdout)

go func() {
<-stopChannel
pid := cmd.Process.Pid
runnerLog("Killing PID %d", pid)
cmd.Process.Kill()
}()

return true
}
3 changes: 2 additions & 1 deletion runner/settings.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,13 @@ package runner

import (
"fmt"
"github.com/pilu/config"
"os"
"path/filepath"
"strconv"
"strings"
"time"

"github.com/pilu/config"
)

const (
Expand Down