itDefer and kill damhs.py and redis when exiting. - tordam - A library for peer discovery inside the Tor network	Err	parazyd.org	70
hgit clone https://git.parazyd.org/tordam	URL:https://git.parazyd.org/tordam	parazyd.org	70
1Log	/git/tordam/log.gph	parazyd.org	70
1Files	/git/tordam/files.gph	parazyd.org	70
1Refs	/git/tordam/refs.gph	parazyd.org	70
1README	/git/tordam/file/README.md.gph	parazyd.org	70
1LICENSE	/git/tordam/file/LICENSE.gph	parazyd.org	70
i---	Err	parazyd.org	70
1commit 49372b5d4c62690ea9d63f568f3b28596e5a8e86	/git/tordam/commit/49372b5d4c62690ea9d63f568f3b28596e5a8e86.gph	parazyd.org	70
1parent 43be00486d49717117eb9afefb875b149b579628	/git/tordam/commit/43be00486d49717117eb9afefb875b149b579628.gph	parazyd.org	70
hAuthor: parazyd <parazyd@dyne.org>	URL:mailto:parazyd@dyne.org	parazyd.org	70
iDate:   Thu,  1 Nov 2018 13:43:01 +0100	Err	parazyd.org	70
i	Err	parazyd.org	70
iDefer and kill damhs.py and redis when exiting.	Err	parazyd.org	70
i	Err	parazyd.org	70
iDiffstat:	Err	parazyd.org	70
i  M cmd/dam-client/main.go              |       3 +--	Err	parazyd.org	70
i  M cmd/dam-dir/main.go                 |       3 ++-	Err	parazyd.org	70
i	Err	parazyd.org	70
i2 files changed, 3 insertions(+), 3 deletions(-)	Err	parazyd.org	70
i---	Err	parazyd.org	70
1diff --git a/cmd/dam-client/main.go b/cmd/dam-client/main.go	/git/tordam/file/cmd/dam-client/main.go.gph	parazyd.org	70
it@@ -258,6 +258,7 @@ func main() {	Err	parazyd.org	70
i 	Err	parazyd.org	70
i         log.Println("Starting up the hidden service.")	Err	parazyd.org	70
i         cmd := exec.Command("damhs.py", lib.PrivKeyPath, lib.TorPortMap)	Err	parazyd.org	70
i+        defer cmd.Process.Kill()	Err	parazyd.org	70
i         stdout, err := cmd.StdoutPipe()	Err	parazyd.org	70
i         lib.CheckError(err)	Err	parazyd.org	70
i 	Err	parazyd.org	70
it@@ -272,8 +273,6 @@ func main() {	Err	parazyd.org	70
i                 for !(ok) {	Err	parazyd.org	70
i                         t2 := time.Now().Unix()	Err	parazyd.org	70
i                         if t2-t1 > 90 {	Err	parazyd.org	70
i-                                err := cmd.Process.Kill()	Err	parazyd.org	70
i-                                lib.CheckError(err)	Err	parazyd.org	70
i                                 log.Fatalln("Too much time has passed for publishing descriptor.")	Err	parazyd.org	70
i                         }	Err	parazyd.org	70
i                         time.Sleep(1000 * time.Millisecond)	Err	parazyd.org	70
1diff --git a/cmd/dam-dir/main.go b/cmd/dam-dir/main.go	/git/tordam/file/cmd/dam-dir/main.go.gph	parazyd.org	70
it@@ -239,7 +239,8 @@ func main() {	Err	parazyd.org	70
i 	Err	parazyd.org	70
i         if _, err := lib.RedisCli.Ping().Result(); err != nil {	Err	parazyd.org	70
i                 // We assume redis is not running. Start it up.	Err	parazyd.org	70
i-                _, err := lib.StartRedis(redconf)	Err	parazyd.org	70
i+                cmd, err := lib.StartRedis(redconf)	Err	parazyd.org	70
i+                defer cmd.Process.Kill()	Err	parazyd.org	70
i                 lib.CheckError(err)	Err	parazyd.org	70
i         }	Err	parazyd.org	70
i 	Err	parazyd.org	70
.