X-Git-Url: http://www.git.cypherpunks.ru/?p=goredo.git;a=blobdiff_plain;f=main.go;h=9f1158182194446d20e8a2c0a103d9b4fa3d86f5;hp=0bb9357e9bf021dcc3c46a085cba5c1a4bd529ea;hb=d8abe40c66df8d79a025524c0d230959cacf9465;hpb=2e85fe511f4f0410e4b8a1dcdb127396b7f3f7c0

diff --git a/main.go b/main.go
index 0bb9357..9f11581 100644
--- a/main.go
+++ b/main.go
@@ -21,17 +21,20 @@ import (
 	"bufio"
 	"bytes"
 	"crypto/rand"
+	"errors"
 	"flag"
 	"fmt"
 	"io"
 	"io/ioutil"
 	"log"
 	"os"
+	"os/signal"
 	"path"
 	"path/filepath"
 	"runtime"
 	"sort"
 	"strconv"
+	"syscall"
 
 	"go.cypherpunks.ru/recfile"
 	"golang.org/x/sys/unix"
@@ -60,8 +63,8 @@ var (
 	IsTopRedo bool // is it the top redo instance
 )
 
-func mustSetenv(key, value string) {
-	if err := os.Setenv(key, value); err != nil {
+func mustSetenv(key string) {
+	if err := os.Setenv(key, "1"); err != nil {
 		panic(err)
 	}
 }
@@ -127,7 +130,7 @@ func main() {
 		}
 		os.Exit(rc)
 	}
-	log.SetFlags(0)
+	log.SetFlags(log.Lshortfile)
 
 	var err error
 	Cwd, err = os.Getwd()
@@ -152,28 +155,28 @@ func main() {
 	DepCwd = os.Getenv(EnvDepCwd)
 
 	if flagStderrKeep != nil && *flagStderrKeep {
-		mustSetenv(EnvStderrKeep, "1")
+		mustSetenv(EnvStderrKeep)
 	}
 	if flagStderrSilent != nil && *flagStderrSilent {
-		mustSetenv(EnvStderrSilent, "1")
+		mustSetenv(EnvStderrSilent)
 	}
 	if flagNoProgress != nil && *flagNoProgress {
-		mustSetenv(EnvNoProgress, "1")
+		mustSetenv(EnvNoProgress)
 	}
 	if flagDebug != nil && *flagDebug {
-		mustSetenv(EnvDebug, "1")
+		mustSetenv(EnvDebug)
 	}
 	if flagLogWait != nil && *flagLogWait {
-		mustSetenv(EnvLogWait, "1")
+		mustSetenv(EnvLogWait)
 	}
 	if flagLogLock != nil && *flagLogLock {
-		mustSetenv(EnvLogLock, "1")
+		mustSetenv(EnvLogLock)
 	}
 	if flagLogPid != nil && *flagLogPid {
-		mustSetenv(EnvLogPid, "1")
+		mustSetenv(EnvLogPid)
 	}
 	if flagLogJS != nil && *flagLogJS {
-		mustSetenv(EnvLogJS, "1")
+		mustSetenv(EnvLogJS)
 	}
 	StderrKeep = os.Getenv(EnvStderrKeep) == "1"
 	StderrSilent = os.Getenv(EnvStderrSilent) == "1"
@@ -187,7 +190,7 @@ func main() {
 	}
 	var traced bool
 	if flagTraceAll != nil && *flagTraceAll {
-		mustSetenv(EnvTrace, "1")
+		mustSetenv(EnvTrace)
 	}
 	if os.Getenv(EnvTrace) == "1" {
 		TracedAll = true
@@ -199,33 +202,35 @@ func main() {
 	// Those are internal envs
 	FdOODTgts, err = ioutil.TempFile("", "ood-tgts")
 	if err != nil {
-		panic(err)
+		log.Fatalln(err)
 	}
 	if err = os.Remove(FdOODTgts.Name()); err != nil {
-		panic(err)
+		log.Fatalln(err)
 	}
 	FdOODTgtsLock, err = ioutil.TempFile("", "ood-tgts.lock")
 	if err != nil {
-		panic(err)
+		log.Fatalln(err)
 	}
 	if err = os.Remove(FdOODTgtsLock.Name()); err != nil {
-		panic(err)
+		log.Fatalln(err)
 	}
 
 	if v := os.Getenv(EnvOODTgtsFd); v != "" {
 		fd := mustParseFd(v, EnvOODTgtsFd)
 		fdLock := mustParseFd(v, EnvOODTgtsLockFd)
 		if err = unix.Flock(int(fdLock.Fd()), unix.LOCK_EX); err != nil {
-			panic(err)
+			log.Fatalln(err)
 		}
 		if _, err = fd.Seek(0, io.SeekStart); err != nil {
-			panic(err)
+			log.Fatalln(err)
 		}
 		tgtsRaw, err := ioutil.ReadAll(bufio.NewReader(fd))
 		if err != nil {
-			panic(err)
+			log.Fatalln(err)
+		}
+		if err = unix.Flock(int(fdLock.Fd()), unix.LOCK_UN); err != nil {
+			log.Fatalln(err)
 		}
-		unix.Flock(int(fdLock.Fd()), unix.LOCK_UN)
 		OODTgts = map[string]struct{}{}
 		for _, tgtRaw := range bytes.Split(tgtsRaw, []byte{0}) {
 			t := string(tgtRaw)
@@ -233,7 +238,7 @@ func main() {
 				continue
 			}
 			OODTgts[t] = struct{}{}
-			trace(CDebug, "ood: known to be: %s", t)
+			tracef(CDebug, "ood: known to be: %s", t)
 		}
 	}
 
@@ -282,9 +287,23 @@ func main() {
 		}
 	}
 
+	killed := make(chan os.Signal, 1)
+	signal.Notify(killed, syscall.SIGHUP, syscall.SIGINT, syscall.SIGTERM)
+	go func() {
+		<-killed
+		tracef(CDebug, "[%s] killed", BuildUUID)
+		jsReleaseAll()
+		RunningProcsM.Lock()
+		for pid, proc := range RunningProcs {
+			tracef(CDebug, "[%s] killing child %d", BuildUUID, pid)
+			_ = proc.Signal(syscall.SIGTERM)
+		}
+		os.Exit(1)
+	}()
+
 	ok := true
 	err = nil
-	trace(
+	tracef(
 		CDebug, "[%s] run: %s %s cwd:%s dirprefix:%s",
 		BuildUUID, cmdName, tgts, Cwd, DirPrefix,
 	)
@@ -308,7 +327,14 @@ CmdSwitch:
 			log.Fatalln("no", EnvDepFd)
 		}
 		for _, tgt := range tgts {
-			err = ifcreate(fdDep, tgt)
+			tgtRel, err := filepath.Rel(
+				filepath.Join(Cwd, DirPrefix),
+				filepath.Join(Cwd, tgt),
+			)
+			if err != nil {
+				break
+			}
+			err = ifcreate(fdDep, tgtRel)
 			if err != nil {
 				break
 			}
@@ -337,12 +363,7 @@ CmdSwitch:
 			log.Fatalln("single target expected")
 		}
 		d, t := cwdAndTgt(tgts[0])
-		var fd *os.File
-		fd, err = os.Open(path.Join(d, RedoDir, t+LogSuffix))
-		if err != nil {
-			break
-		}
-		_, err = io.Copy(os.Stdout, fd)
+		err = showBuildLog(d, t, nil, 0)
 	case CmdNameRedoWhichdo:
 		if len(tgts) != 1 {
 			log.Fatalln("single target expected")
@@ -368,7 +389,7 @@ CmdSwitch:
 		for {
 			m, err := r.NextMap()
 			if err != nil {
-				if err == io.EOF {
+				if errors.Is(err, io.EOF) {
 					break
 				}
 				break CmdSwitch
@@ -469,6 +490,6 @@ CmdSwitch:
 	if !ok || err != nil {
 		rc = 1
 	}
-	trace(CDebug, "[%s] finished: %s %s", BuildUUID, cmdName, tgts)
+	tracef(CDebug, "[%s] finished: %s %s", BuildUUID, cmdName, tgts)
 	os.Exit(rc)
 }