fix: don't exit gpg server after just one connection

smlx · Jul 26, 2021 · 253ff6e · 253ff6e
1 parent ce2decb
commit 253ff6e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/cmd/piv-agent/serve.go b/cmd/piv-agent/serve.go
@@ -85,6 +85,7 @@ loop:
 	for {
 		select {
 		case <-ctx.Done():
+			log.Debug("exit done")
 			break loop
 		case <-exit.C:
 			log.Debug("exit timeout")

diff --git a/internal/server/gpg.go b/internal/server/gpg.go
@@ -47,7 +47,9 @@ func (g *GPG) Serve(ctx context.Context, l net.Listener, exit *time.Ticker,
 			a := assuan.New(conn, g.pivService)
 			// run the protocol state machine to completion
 			// (client severs connection)
-			return a.Run(conn)
+			if err := a.Run(conn); err != nil {
+				return err
+			}
 		case <-ctx.Done():
 			return nil
 		}