buffer: remove gpstream & SIGTERM handler

SIGTERM will kill us anyway, and then the control stream gets
automatically closed.  Fin.

2 files changed, 1 insertions, 13 deletions

diff --git a/src/server/buffer.nim b/src/server/buffer.nim
index 1c3f9939..76b4bc29 100644
--- a/src/server/buffer.nim
+++ b/src/server/buffer.nim
@@ -877,8 +877,6 @@ proc rewind(buffer: Buffer; data: InputData; offset: int;
   buffer.bytesRead = offset
   return true
 
-var gpstream* {.global.}: SocketStream
-
 # Create an exact clone of the current buffer.
 # This clone will share the loader process with the previous buffer.
 proc clone*(buffer: Buffer; newurl: URL): int {.proxy.} =
@@ -945,7 +943,6 @@ proc clone*(buffer: Buffer; newurl: URL): int {.proxy.} =
     for it in buffer.tasks.mitems:
       it = 0
     buffer.pstream = pstream
-    gpstream = buffer.pstream
     buffer.loader.clientPid = myPid
     # get key for new buffer
     buffer.loader.controlStream.sclose()
@@ -1894,9 +1891,7 @@ proc runBuffer(buffer: Buffer) =
         buffer.maybeReshape()
 
 proc cleanup(buffer: Buffer) =
-  if gpstream != nil:
-    gpstream.sclose()
-    gpstream = nil
+  buffer.pstream.sclose()
   buffer.window.crypto.urandom.sclose()
 
 proc launchBuffer*(config: BufferConfig; url: URL; attrs: WindowAttributes;
diff --git a/src/server/forkserver.nim b/src/server/forkserver.nim
index d54db0f0..cb9602f5 100644
--- a/src/server/forkserver.nim
+++ b/src/server/forkserver.nim
@@ -128,13 +128,6 @@ proc forkBuffer(ctx: var ForkServerContext; r: var PacketReader): int =
       loaderStream = newSocketStream(r.recvFd())
       istream = newSocketStream(r.recvFd())
     let loader = newFileLoader(pid, loaderStream)
-    gpstream = pstream
-    onSignal SIGTERM:
-      discard sig
-      if gpstream != nil:
-        gpstream.sclose()
-        gpstream = nil
-      exitnow(1)
     signal(SIGPIPE, SIG_DFL)
     enterBufferSandbox()
     try: