From: "John 'Warthog9' Hawley" <warthog9@eaglescrag.net>
To: git@vger.kernel.org
Subject: [PATCH 18/18] gitweb: Add better error handling for gitweb caching
Date: Thu, 9 Dec 2010 13:57:24 -0800 [thread overview]
Message-ID: <1291931844-28454-19-git-send-email-warthog9@eaglescrag.net> (raw)
In-Reply-To: <1291931844-28454-1-git-send-email-warthog9@eaglescrag.net>
This basically finishes the plumbing for caching the error pages
as the are generated.
If an error is hit, create a <hash>.err file with the error. This
will interrupt all currently waiting processes and they will display
the error, without any additional refreshing.
On a new request a generation will be attempted, should it succed the
<hash.err> file is removed (if it exists).
Signed-off-by: John 'Warthog9' Hawley <warthog9@eaglescrag.net>
---
gitweb/gitweb.perl | 8 ++++++++
gitweb/lib/cache.pl | 14 ++++++++++++++
2 files changed, 22 insertions(+), 0 deletions(-)
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index d39982a..5a9660a 100755
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@ -41,6 +41,7 @@ our $version = "++GIT_VERSION++";
# Output buffer variable
our $output = "";
+our $output_err = "";
our ($my_url, $my_uri, $base_url, $path_info, $home_link);
sub evaluate_uri {
@@ -303,6 +304,9 @@ our $fullhashpath = *STDOUT;
our $fullhashbinpath = *STDOUT;
our $fullhashbinpathfinal = *STDOUT;
+our $cacheErrorCache = 0; # false
+our $cacheErrorCount = 0;
+
our $full_url;
our $urlhash;
@@ -3786,6 +3790,7 @@ sub die_error {
# Reset the output so that we are actually going to STDOUT as opposed
# to buffering the output.
reset_output() if ($cache_enable && ! $cacheErrorCache);
+ $cacheErrorCount++ if( $cacheErrorCache );
git_header_html($http_responses{$status}, undef, %opts);
print <<EOF;
@@ -3801,6 +3806,9 @@ EOF
print "</div>\n";
git_footer_html();
+
+ die_error_cache($output) if ( $cacheErrorCache );
+
goto DONE_GITWEB
unless ($opts{'-error_handler'});
}
diff --git a/gitweb/lib/cache.pl b/gitweb/lib/cache.pl
index 6cb82c8..2e7ca69 100644
--- a/gitweb/lib/cache.pl
+++ b/gitweb/lib/cache.pl
@@ -240,8 +240,14 @@ sub cacheUpdate {
# Trap all output from the action
change_output();
+ # Set the error handler so we cache
+ $cacheErrorCache = 1; # true
+
$actions{$action}->();
+ # Reset Error Handler to not cache
+ $cacheErrorCache = 0; # false
+
# Reset the outputs as we should be fine now
reset_output();
@@ -295,6 +301,8 @@ sub cacheUpdate {
close($cacheFileBG);
}
+ unlink("$fullhashpath.err") if (-e "$fullhashpath.err");
+
if ( $areForked ){
exit(0);
} else {
@@ -339,6 +347,9 @@ sub cacheWaitForUpdate {
my $max = 10;
my $lockStat = 0;
+ # Call cacheDisplayErr - if an error exists it will display and die. If not it will just return
+ cacheDisplayErr($action);
+
if( $backgroundCache ){
if( -e "$fullhashpath" ){
open($cacheFile, '<:utf8', "$fullhashpath");
@@ -402,6 +413,9 @@ EOF
close($cacheFile);
$x++;
$combinedLockStat = $lockStat;
+
+ # Call cacheDisplayErr - if an error exists it will display and die. If not it will just return
+ cacheDisplayErr($action);
} while ((! $combinedLockStat) && ($x < $max));
print <<EOF;
</body>
--
1.7.2.3
next prev parent reply other threads:[~2010-12-09 21:56 UTC|newest]
Thread overview: 60+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-12-09 21:57 [PATCH 00/18] Gitweb caching v8 John 'Warthog9' Hawley
2010-12-09 21:57 ` [PATCH 01/18] gitweb: Prepare for splitting gitweb John 'Warthog9' Hawley
2010-12-09 23:30 ` Jakub Narebski
2010-12-09 21:57 ` [PATCH 02/18] gitweb: add output buffering and associated functions John 'Warthog9' Hawley
2010-12-09 21:57 ` [PATCH 03/18] gitweb: File based caching layer (from git.kernel.org) John 'Warthog9' Hawley
2010-12-09 21:57 ` [PATCH 04/18] gitweb: Minimal testing of gitweb caching John 'Warthog9' Hawley
2010-12-09 21:57 ` [PATCH 05/18] gitweb: Regression fix concerning binary output of files John 'Warthog9' Hawley
2010-12-09 23:33 ` Jakub Narebski
2010-12-09 21:57 ` [PATCH 06/18] gitweb: Add more explicit means of disabling 'Generating...' page John 'Warthog9' Hawley
2010-12-09 21:57 ` [PATCH 07/18] gitweb: Revert back to $cache_enable vs. $caching_enabled John 'Warthog9' Hawley
2010-12-09 23:38 ` Jakub Narebski
2010-12-10 2:38 ` J.H.
2010-12-10 13:48 ` Jakub Narebski
2010-12-09 21:57 ` [PATCH 08/18] gitweb: Change is_cacheable() to return true always John 'Warthog9' Hawley
2010-12-09 23:46 ` Jakub Narebski
2010-12-09 21:57 ` [PATCH 09/18] gitweb: Revert reset_output() back to original code John 'Warthog9' Hawley
2010-12-09 23:58 ` Jakub Narebski
2010-12-10 2:43 ` J.H.
2010-12-09 21:57 ` [PATCH 10/18] gitweb: Adding isBinaryAction() and isFeedAction() to determine the action type John 'Warthog9' Hawley
2010-12-10 0:06 ` Jakub Narebski
2010-12-10 3:39 ` J.H.
2010-12-10 12:10 ` Jakub Narebski
2010-12-10 12:25 ` Jakub Narebski
2010-12-09 21:57 ` [PATCH 11/18] gitweb: add isDumbClient() check John 'Warthog9' Hawley
2010-12-10 0:12 ` Jakub Narebski
2010-12-10 4:00 ` J.H.
2010-12-11 0:07 ` Junio C Hamano
2010-12-11 0:15 ` Jakub Narebski
2010-12-11 1:15 ` J.H.
2010-12-11 1:40 ` Jakub Narebski
2010-12-09 21:57 ` [PATCH 12/18] gitweb: Change file handles (in caching) to lexical variables as opposed to globs John 'Warthog9' Hawley
2010-12-10 0:16 ` Jakub Narebski
2010-12-10 0:32 ` Junio C Hamano
2010-12-10 0:47 ` Jakub Narebski
2010-12-10 5:56 ` J.H.
2010-12-09 21:57 ` [PATCH 13/18] gitweb: Add commented url & url hash to page footer John 'Warthog9' Hawley
2010-12-10 0:26 ` Jakub Narebski
2010-12-10 6:10 ` J.H.
2010-12-09 21:57 ` [PATCH 14/18] gitweb: add print_transient_header() function for central header printing John 'Warthog9' Hawley
2010-12-10 0:36 ` Jakub Narebski
2010-12-10 6:18 ` J.H.
2010-12-09 21:57 ` [PATCH 15/18] gitweb: Add show_warning() to display an immediate warning, with refresh John 'Warthog9' Hawley
2010-12-10 1:01 ` Jakub Narebski
2010-12-10 7:38 ` J.H.
2010-12-10 14:10 ` Jakub Narebski
2010-12-09 21:57 ` [PATCH 16/18] gitweb: When changing output (STDOUT) change STDERR as well John 'Warthog9' Hawley
2010-12-10 1:36 ` Jakub Narebski
2010-12-12 5:25 ` J.H.
2010-12-12 15:17 ` Jakub Narebski
2010-12-09 21:57 ` [PATCH 17/18] gitweb: Prepare for cached error pages & better error page handling John 'Warthog9' Hawley
2010-12-10 1:49 ` Jakub Narebski
2010-12-10 8:33 ` J.H.
2010-12-10 20:33 ` Jakub Narebski
2010-12-09 21:57 ` John 'Warthog9' Hawley [this message]
2010-12-10 1:56 ` [PATCH 18/18] gitweb: Add better error handling for gitweb caching Jakub Narebski
2010-12-09 23:26 ` [PATCH 00/18] Gitweb caching v8 Jakub Narebski
2010-12-10 0:43 ` J.H.
2010-12-10 1:27 ` Jakub Narebski
2010-12-10 0:39 ` Junio C Hamano
2010-12-10 0:45 ` J.H.
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1291931844-28454-19-git-send-email-warthog9@eaglescrag.net \
--to=warthog9@eaglescrag.net \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).