Avii/Radicale
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #1894 from pbiering/reponsesizelog

Browse Source 
add response size logging and extend related logwatch script
This commit is contained in:
Peter Bieringer
2025-10-04 11:57:08 +02:00
committed by GitHub
parent dfa6e5dbb3 bb6e9171c7
commit 5c476a6a7a
2 changed files with 59 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
contrib/logwatch/radicale
View File

@@ -1,6 +1,6 @@
# This file is related to Radicale - CalDAV and CardDAV server
# for logwatch (script)
# Copyright © 2024-2024 Peter Bieringer <pb@bieringer.de>
# Copyright © 2024-2025 Peter Bieringer <pb@bieringer.de>
#
# Detail levels
# >= 5: Logins
@@ -9,6 +9,7 @@
$Detail = $ENV{'LOGWATCH_DETAIL_LEVEL'} || 0;
my %ResponseTimes;
my %ResponseSizes;
my %Responses;
my %Requests;
my %Logins;
@@ -39,6 +40,28 @@ sub ResponseTimesMinMaxSum($$) {
$ResponseTimes{$req}->{'sum'} += $time;
}
sub ResponseSizesMinMaxSum($$$) {
my $req = $_[0];
my $type = $_[1];
my $size = $_[2];
$ResponseSizes{$type}->{$req}->{'cnt'}++;
if (! defined $ResponseSizes{$type}->{$req}->{'min'}) {
$ResponseSizes{$type}->{$req}->{'min'} = $size;
} elsif ($ResponseSizes{$type}->{$req}->{'min'} > $size) {
$ResponseSizes{$type}->{$req}->{'min'} = $size;
}
if (! defined $ResponseSizes{$type}->{$req}->{'max'}) {
$ResponseSizes{$type}->{$req}{'max'} = $size;
} elsif ($ResponseSizes{$type}->{$req}->{'max'} < $size) {
$ResponseSizes{$type}->{$req}{'max'} = $size;
}
$ResponseSizes{$type}->{$req}->{'sum'} += $size;
}
sub Sum($) {
my $phash = $_[0];
my $sum = 0;
@@ -75,9 +98,17 @@ while (defined($ThisLine = <STDIN>)) {
if ( $ThisLine =~ / \S+ response status for .* with depth '(\d)' in ([0-9.]+) seconds: (\d+)/o ) {
$req .= ":D=" . $1 . ":R=" . $3;
ResponseTimesMinMaxSum($req, $2) if ($Detail >= 10);
} elsif ( $ThisLine =~ / \S+ response status for .* in ([0-9.]+) seconds: (\d+)/ ) {
} elsif ( $ThisLine =~ / \S+ response status for .* in ([0-9.]+) seconds: (\d+)/o ) {
$req .= ":R=" . $2;
ResponseTimesMinMaxSum($req, $1) if ($Detail >= 10);
} elsif ( $ThisLine =~ / \S+ response status for .* with depth '(\d)' in ([0-9.]+) seconds (\S+) (\d+) bytes: (\d+)/o ) {
$req .= ":D=" . $1 . ":R=" . $5;
ResponseTimesMinMaxSum($req, $2) if ($Detail >= 10);
ResponseSizesMinMaxSum($req, $3, $4) if ($Detail >= 10);
} elsif ( $ThisLine =~ / \S+ response status for .* in ([0-9.]+) seconds (\S+) (\d+) bytes: (\d+)/o ) {
$req .= ":R=" . $4;
ResponseTimesMinMaxSum($req, $1) if ($Detail >= 10);
ResponseSizesMinMaxSum($req, $2, $3) if ($Detail >= 10);
}
$Responses{$req}++;
}
@@ -174,6 +205,22 @@ if (keys %ResponseTimes) {
print "-" x60 . "\n";
}
if (keys %ResponseSizes) {
for my $type (sort keys %ResponseSizes) {
print "\n**Response sizes (counts, bytes: $type) (D=<depth> R=<result>)**\n";
printf "%-18s | %7s | %9s | %9s | %9s |\n", "Response", "cnt", "min", "max", "avg";
print "-" x66 . "\n";
foreach my $req (sort keys %{$ResponseSizes{$type}}) {
printf "%-18s | %7d | %9d | %9d | %9d |\n", $req
, $ResponseSizes{$type}->{$req}->{'cnt'}
, $ResponseSizes{$type}->{$req}->{'min'}
, $ResponseSizes{$type}->{$req}->{'max'}
, $ResponseSizes{$type}->{$req}->{'sum'} / $ResponseSizes{$type}->{$req}->{'cnt'};
}
print "-" x66 . "\n";
}
}
if (keys %OtherEvents) {
print "\n**Other Events**\n";
foreach $ThisOne (sort keys %OtherEvents) {

13
radicale/app/__init__.py
View File

@@ -164,6 +164,7 @@ class Application(ApplicationPartDelete, ApplicationPartHead,
answer: Union[None, str, bytes]) -> _IntermediateResponse:
"""Helper to create response from internal types.WSGIResponse"""
headers = dict(headers)
content_encoding = "plain"
# Set content length
answers = []
if answer is not None:
@@ -183,6 +184,7 @@ class Application(ApplicationPartDelete, ApplicationPartHead,
zcomp = zlib.compressobj(wbits=16 + zlib.MAX_WBITS)
answer = zcomp.compress(answer) + zcomp.flush()
headers["Content-Encoding"] = "gzip"
content_encoding = "gzip"
headers["Content-Length"] = str(len(answer))
answers.append(answer)
@@ -194,9 +196,14 @@ class Application(ApplicationPartDelete, ApplicationPartHead,
time_end = datetime.datetime.now()
status_text = "%d %s" % (
status, client.responses.get(status, "Unknown"))
logger.info("%s response status for %r%s in %.3f seconds: %s",
request_method, unsafe_path, depthinfo,
(time_end - time_begin).total_seconds(), status_text)
if answer is not None:
logger.info("%s response status for %r%s in %.3f seconds %s %s bytes: %s",
request_method, unsafe_path, depthinfo,
(time_end - time_begin).total_seconds(), content_encoding, str(len(answer)), status_text)
else:
logger.info("%s response status for %r%s in %.3f seconds: %s",
request_method, unsafe_path, depthinfo,
(time_end - time_begin).total_seconds(), status_text)
# Return response content
return status_text, list(headers.items()), answers