diff options
| author | Ricardo Wurmus <rekado@elephly.net> | 2018-11-10 10:52:49 +0100 |
|---|---|---|
| committer | Ricardo Wurmus <rekado@elephly.net> | 2018-11-10 10:52:49 +0100 |
| commit | 4bd415ea47282017a4048c42ee963f2ce20e1c97 (patch) | |
| tree | fd698e9c9cbaec47e60dda672575383c52088024 | |
| parent | f123c200cda6376f1734ef5c155759ea2c26b0aa (diff) | |
Use Guile Fibers web server.
* mumi/web/server.scm (handler): Simplify.
(start-mumi-web-server): Use fiberized server.
* guix.scm: Add guile-fibers to inputs.
* configure.ac: Check for availability of fibers.
| -rw-r--r-- | configure.ac | 5 | ||||
| -rw-r--r-- | guix.scm | 1 | ||||
| -rw-r--r-- | mumi/web/server.scm | 15 |
3 files changed, 12 insertions, 9 deletions
diff --git a/configure.ac b/configure.ac index a4dbdcf..2442982 100644 --- a/configure.ac +++ b/configure.ac @@ -21,6 +21,11 @@ if test "x$have_guile_email" != "xyes"; then AC_MSG_ERROR([guile-email is missing; please install it.]) fi +GUILE_MODULE_AVAILABLE([have_fibers], [(fibers web server)]) +if test "x$have_fibers" != "xyes"; then + AC_MSG_ERROR([Guile fibers is missing; please install it.]) +fi + guilemoduledir="${datarootdir}/guile/site/${GUILE_EFFECTIVE_VERSION}" AC_SUBST([guilemoduledir]) AC_SUBST([GUILE_EFFECTIVE_VERSION]) @@ -100,6 +100,7 @@ Debbugs bug tracker's SOAP service.") (inputs `(("guile-debbugs" ,guile-debbugs-next) ("guile-email" ,guile-email) + ("guile-fibers" ,guile-fibers) ("guile-syntax-highlight" ,guile-syntax-highlight) ("guile" ,guile-2.2.4))) (native-inputs diff --git a/mumi/web/server.scm b/mumi/web/server.scm index 0c1f662..b86ef3b 100644 --- a/mumi/web/server.scm +++ b/mumi/web/server.scm @@ -19,8 +19,8 @@ #:use-module (srfi srfi-1) #:use-module (web http) #:use-module (web request) - #:use-module (web server) #:use-module (web uri) + #:use-module (fibers web server) #:use-module (mumi web controller) #:use-module (mumi web util) #:export (start-mumi-web-server)) @@ -35,13 +35,10 @@ (request-method request) (uri-path (request-uri request))) (apply values - (append - (run-controller controller request body) - (list controller)))) + (run-controller controller request body))) (define (start-mumi-web-server port) - (run-server (lambda args (apply handler args)) - 'http - `(#:addr ,INADDR_ANY - #:port ,port) - controller)) + (run-server (lambda (request body) + (handler request body controller)) + #:addr INADDR_ANY + #:port port)) |