itSome code linting. - 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 79e3828b0a407d302f13439ad960a5d146f58db9 /git/tordam/commit/79e3828b0a407d302f13439ad960a5d146f58db9.gph parazyd.org 70 1parent f2d58e428131ad3255784e71d58f505392df2325 /git/tordam/commit/f2d58e428131ad3255784e71d58f505392df2325.gph parazyd.org 70 hAuthor: parazyd URL:mailto:parazyd@dyne.org parazyd.org 70 iDate: Tue, 9 Mar 2021 15:56:37 +0100 Err parazyd.org 70 i Err parazyd.org 70 iSome code linting. Err parazyd.org 70 i Err parazyd.org 70 iDiffstat: Err parazyd.org 70 i M cmd/tor-dam/tor-dam.go | 12 ++++++++++-- Err parazyd.org 70 i M tor_test.go | 6 +++++- Err parazyd.org 70 i Err parazyd.org 70 i2 files changed, 15 insertions(+), 3 deletions(-) Err parazyd.org 70 i--- Err parazyd.org 70 1diff --git a/cmd/tor-dam/tor-dam.go b/cmd/tor-dam/tor-dam.go /git/tordam/file/cmd/tor-dam/tor-dam.go.gph parazyd.org 70 it@@ -119,7 +119,11 @@ func main() { Err parazyd.org 70 i // Spawn Tor daemon and let it settle Err parazyd.org 70 i tor, err := tordam.SpawnTor(tordam.Cfg.Listen, tordam.Cfg.Portmap, Err parazyd.org 70 i tordam.Cfg.Datadir) Err parazyd.org 70 i- defer tor.Process.Kill() Err parazyd.org 70 i+ defer func() { Err parazyd.org 70 i+ if err := tor.Process.Kill(); err != nil { Err parazyd.org 70 i+ log.Println(err) Err parazyd.org 70 i+ } Err parazyd.org 70 i+ }() Err parazyd.org 70 i if err != nil { Err parazyd.org 70 i log.Fatal(err) Err parazyd.org 70 i } Err parazyd.org 70 it@@ -153,7 +157,11 @@ func main() { Err parazyd.org 70 i // "ann" is the JSON-RPC endpoint for peer discovery/announcement Err parazyd.org 70 i "ann": handler.NewService(tordam.Ann{}), Err parazyd.org 70 i } Err parazyd.org 70 i- go server.Loop(l, server.NewStatic(assigner), nil) Err parazyd.org 70 i+ go func() { Err parazyd.org 70 i+ if err := server.Loop(l, server.NewStatic(assigner), nil); err != nil { Err parazyd.org 70 i+ log.Println(err) Err parazyd.org 70 i+ } Err parazyd.org 70 i+ }() Err parazyd.org 70 i log.Println("Started JSON-RPC server on", tordam.Cfg.Listen.String()) Err parazyd.org 70 i Err parazyd.org 70 i // If decided to not announce to anyone Err parazyd.org 70 1diff --git a/tor_test.go b/tor_test.go /git/tordam/file/tor_test.go.gph parazyd.org 70 it@@ -28,7 +28,11 @@ func TestSpawnTor(t *testing.T) { Err parazyd.org 70 i t.Fatal(err) Err parazyd.org 70 i } Err parazyd.org 70 i tor, err := SpawnTor(l, []string{"1234:1234"}, "tor_test") Err parazyd.org 70 i- defer tor.Process.Kill() Err parazyd.org 70 i+ defer func() { Err parazyd.org 70 i+ if err := tor.Process.Kill(); err != nil { Err parazyd.org 70 i+ t.Fatal(err) Err parazyd.org 70 i+ } Err parazyd.org 70 i+ }() Err parazyd.org 70 i defer os.RemoveAll("tor_test") Err parazyd.org 70 i if err != nil { Err parazyd.org 70 i t.Fatal(err) Err parazyd.org 70 .