steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Better logging

db4
Slava Pestov 2008-09-28 17:56:44 -05:00
parent a550b17b16
commit d3423bec4f
4 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
basis/http/http.factor
View File

@ -3,15 +3,13 @@
USING: accessors kernel combinators math namespaces make USING: accessors kernel combinators math namespaces make
assocs sequences splitting sorting sets debugger assocs sequences splitting sorting sets debugger
strings vectors hashtables quotations arrays byte-arrays strings vectors hashtables quotations arrays byte-arrays
math.parser calendar calendar.format present math.parser calendar calendar.format present urls logging
io io.encodings io.encodings.iana io.encodings.binary io io.encodings io.encodings.iana io.encodings.binary
io.encodings.8-bit io.encodings.8-bit
unicode.case unicode.categories qualified unicode.case unicode.categories qualified
urls
http.parsers ; http.parsers ;
EXCLUDE: fry => , ; EXCLUDE: fry => , ;
@ -98,6 +96,8 @@ TUPLE: cookie name value version comment path domain expires max-age http-only s
drop drop
] { } make ; ] { } make ;
\ parse-cookie DEBUG add-input-logging
: check-cookie-string ( string -- string' ) : check-cookie-string ( string -- string' )
dup "=;'\"\r\n" intersect empty? dup "=;'\"\r\n" intersect empty?
[ "Bad cookie name or value" throw ] unless ; [ "Bad cookie name or value" throw ] unless ;

4
basis/http/parsers/parsers.factor
View File

@ -2,7 +2,7 @@
! See http://factorcode.org/license.txt for BSD license. ! See http://factorcode.org/license.txt for BSD license.
USING: combinators.short-circuit math math.order math.parser USING: combinators.short-circuit math math.order math.parser
kernel sequences sequences.deep peg peg.parsers assocs arrays kernel sequences sequences.deep peg peg.parsers assocs arrays
hashtables strings unicode.case namespaces make ascii ; hashtables strings unicode.case namespaces make ascii logging ;
IN: http.parsers IN: http.parsers
: except ( quot -- parser ) : except ( quot -- parser )
@ -61,6 +61,8 @@ PEG: parse-request-line ( string -- triple )
'space' , 'space' ,
] seq* just ; ] seq* just ;
\ parse-request-line DEBUG add-input-logging
: 'text' ( -- parser ) : 'text' ( -- parser )
[ ctl? ] except ; [ ctl? ] except ;

2
basis/io/servers/connection/connection.factor
View File

@ -78,6 +78,8 @@ M: threaded-server handle-client* handler>> call ;
[ timeout>> timeouts ] [ handle-client* ] bi [ timeout>> timeouts ] [ handle-client* ] bi
] with-stream ; ] with-stream ;
\ handle-client ERROR add-error-logging
: thread-name ( server-name addrspec -- string ) : thread-name ( server-name addrspec -- string )
unparse-short " connection from " swap 3append ; unparse-short " connection from " swap 3append ;

2
basis/io/unix/sockets/secure/secure.factor
View File

@ -27,8 +27,10 @@ M: ssl-handle handle-fd file>> handle-fd ;
{ {
{ SSL_ERROR_NONE [ 2drop f ] } { SSL_ERROR_NONE [ 2drop f ] }
{ SSL_ERROR_WANT_READ [ 2drop +input+ ] } { SSL_ERROR_WANT_READ [ 2drop +input+ ] }
{ SSL_ERROR_WANT_ACCEPT [ 2drop +input+ ] }
{ SSL_ERROR_WANT_WRITE [ 2drop +output+ ] } { SSL_ERROR_WANT_WRITE [ 2drop +output+ ] }
{ SSL_ERROR_SYSCALL [ syscall-error ] } { SSL_ERROR_SYSCALL [ syscall-error ] }
{ SSL_ERROR_ZERO_RETURN [ (ssl-error) ] }
{ SSL_ERROR_SSL [ (ssl-error) ] } { SSL_ERROR_SSL [ (ssl-error) ] }
} case ; } case ;