From 4355bb221c71ec0a6b4653c0b328b59fb95bc2da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hugo=20H=C3=B6rnquist?= <hugo@lysator.liu.se>
Date: Mon, 4 May 2020 22:34:52 +0200
Subject: Catch address already in use for HTTP server.

---
 module/entry-points/server.scm | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/module/entry-points/server.scm b/module/entry-points/server.scm
index 919dc936..6ab9a2d1 100644
--- a/module/entry-points/server.scm
+++ b/module/entry-points/server.scm
@@ -222,9 +222,15 @@
           addr port
           (getpid) (getcwd))
 
-  (run-server (make-make-routes)
-              'http
-              `(family: ,family
-                        port: ,port
-                        host: ,addr)
-              0))
+  (catch 'system-error
+    (lambda ()
+     (run-server (make-make-routes)
+                 'http
+                 `(family: ,family
+                           port: ,port
+                           host: ,addr)
+                 0))
+    ;; probably address already in use
+    (lambda (err proc fmt args errno)
+      (format (current-error-port) "~a: ~?~%"
+              proc fmt args))))
-- 
cgit v1.2.3