diff --git a/extra/http/server/server.factor b/extra/http/server/server.factor index 4ad44554f5..095b52171c 100755 --- a/extra/http/server/server.factor +++ b/extra/http/server/server.factor @@ -13,7 +13,7 @@ io.encodings.ascii io.encodings.binary io.streams.limited io.timeouts -fry logging calendar urls +fry logging logging.insomniac calendar urls http http.server.responses html.elements @@ -140,4 +140,7 @@ LOG: httpd-hit NOTICE : httpd-main ( -- ) 8888 httpd ; +: httpd-insomniac ( -- ) + "http.server" { httpd-hit } schedule-insomniac ; + MAIN: httpd-main diff --git a/extra/logging/logging.factor b/extra/logging/logging.factor index f46fcf6c53..5168e7fcd2 100755 --- a/extra/logging/logging.factor +++ b/extra/logging/logging.factor @@ -42,11 +42,9 @@ SYMBOL: log-service message ( obj -- inputs>message ) - dup one-string-array? [ first ] [ + dup array? [ dup length 1 = [ first ] when ] when + dup string? [ [ string-limit off 1 line-limit set @@ -54,7 +52,7 @@ PREDICATE: one-string-array < array 0 margin set unparse ] with-scope - ] if ; + ] unless ; PRIVATE> diff --git a/extra/webapps/factor-website/factor-website.factor b/extra/webapps/factor-website/factor-website.factor index fa598c0948..04fc0487b8 100644 --- a/extra/webapps/factor-website/factor-website.factor +++ b/extra/webapps/factor-website/factor-website.factor @@ -3,6 +3,7 @@ USING: accessors kernel sequences assocs io.files io.sockets io.server namespaces db db.tuples db.sqlite smtp +logging.insomniac http.server http.server.dispatchers furnace.alloy @@ -61,10 +62,13 @@ TUPLE: factor-website < dispatcher ; : init-factor-website ( -- ) "factorcode.org" 25 smtp-server set-global "todo@factorcode.org" lost-password-from set-global + "website@factorcode.org" insomniac-sender set-global + "slava@factorcode.org" insomniac-recipients set-global init-factor-db main-responder set-global ; : start-factor-website ( -- ) test-db start-expiring test-db start-update-task + httpd-insomniac 8812 httpd ;