cco/cl-scopes
3
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity Actions

web/server: stop server via shutdown, using unwind-protect

Browse source
This commit is contained in:
Helmut Merz 2024-06-25 18:41:56 +02:00
parent c3f4c20a75
commit 10948ef009
2 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
test/test-web.lisp
View file

@ -19,6 +19,8 @@
(let ((t:*test-suite* (t:test-suite "web")) (let ((t:*test-suite* (t:test-suite "web"))
(*config* nil)) (*config* nil))
(load (t:test-path "config-web" "etc")) (load (t:test-path "config-web" "etc"))
(unwind-protect
(progn
(core:setup-services *config*) (core:setup-services *config*)
(let ((server (core:find-service :server)) (let ((server (core:find-service :server))
(client (core:find-service :client))) (client (core:find-service :client)))
@ -26,8 +28,8 @@
(sleep 0.1) (sleep 0.1)
(test-fileserver client) (test-fileserver client)
(test-message client) (test-message client)
(sleep 0.1) (sleep 0.1)))
(server:stop (core:find-service :server)) (core:shutdown)
(t:show-result)))) (t:show-result))))
(deftest test-server-config (server) (deftest test-server-config (server)

1
web/server.lisp
View file

@ -14,6 +14,7 @@
(defclass config (config:base) (defclass config (config:base)
((config:env-slots :initform '(address port)) ((config:env-slots :initform '(address port))
(config:setup :initform #'setup) (config:setup :initform #'setup)
(config:shutdown :initform #'stop)
(address :reader address :initarg :address :initform "localhost") (address :reader address :initarg :address :initform "localhost")
(port :reader port :initarg :port :initform "8888") (port :reader port :initarg :port :initform "8888")
(routes :reader routes :initarg :routes :initform nil))) (routes :reader routes :initarg :routes :initform nil)))