Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added custom log formats %m, %U, %q and %H by Plack::Middleware::AccessLog #372

Merged
merged 1 commit into from
Feb 8, 2013
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions lib/Plack/Middleware/AccessLog.pm
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,10 @@ sub log_line {
V => sub { $env->{HTTP_HOST} || $env->{SERVER_NAME} || '-' },
p => sub { $env->{SERVER_PORT} },
P => sub { $$ },
m => sub { _safe($env->{REQUEST_METHOD}) },
U => sub { _safe($env->{PATH_INFO}) },
q => sub { ($env->{QUERY_STRING} ne '') ? '?' . _safe($env->{QUERY_STRING}) : '' },
H => sub { $env->{SERVER_PROTOCOL} },
);

my $char_handler = sub {
Expand Down Expand Up @@ -184,6 +188,10 @@ L<Apache's LogFormat templates|http://httpd.apache.org/docs/2.0/mod/mod_log_conf
%V HTTP_HOST or SERVER_NAME from the PSGI environment, or -
%p SERVER_PORT from the PSGI environment
%P the worker's process id
%m REQUEST_METHOD from the PSGI environment
%U PATH_INFO from the PSGI environment
%q QUERY_STRING from the PSGI environment
%H SERVER_PROTOCOL from the PSGI environment

Some of these format fields are only supported by middleware that subclasses C<AccessLog>.

Expand Down
18 changes: 18 additions & 0 deletions t/Plack-Middleware/access_log.t
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,22 @@ my $test = sub {
is $log, '-';
}

{
my $req = GET "http://example.com/";
my $fmt = "%r == %m %U%q %H";
$test->($fmt)->($req);
chomp $log;
my ($r, $rs) = split / == /, $log;
is $r, $rs;
}

{
my $req = GET "http://example.com/foo?bar=baz";
my $fmt = "%r == %m %U%q %H";
$test->($fmt)->($req);
chomp $log;
my ($r, $rs) = split / == /, $log;
is $r, $rs;
}

done_testing;