[Rt-commit] rt branch, 3.9-fix-queue-caching, created. rt-3.8.8-739-ge7c5cda
Kevin Falcone
falcone at bestpractical.com
Fri Sep 10 18:09:25 EDT 2010
The branch, 3.9-fix-queue-caching has been created
at e7c5cdad0b72164fb290784c7c6cae7585607516 (commit)
- Log -----------------------------------------------------------------
commit 35aaac3e044c5db2dc7281beb7d1add7828b8081
Author: Kevin Falcone <falcone at bestpractical.com>
Date: Fri Sep 10 18:10:39 2010 -0400
Trivial port of rt-attributes-viewer to dump sessions
diff --git a/.gitignore b/.gitignore
index db40cd0..e5d60a9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,6 +25,7 @@ sbin/rt-email-dashboards
sbin/rt-email-digest
sbin/rt-email-group-admin
sbin/rt-server
+sbin/rt-session-viewer
sbin/rt-setup-database
sbin/rt-shredder
sbin/rt-test-dependencies
diff --git a/Makefile.in b/Makefile.in
index e023e16..2e8acef 100755
--- a/Makefile.in
+++ b/Makefile.in
@@ -170,6 +170,7 @@ SYSTEM_BINARIES = rt-attributes-viewer \
rt-email-dashboards \
rt-email-group-admin \
rt-server \
+ rt-session-viewer \
rt-test-dependencies \
rt-clean-sessions \
rt-shredder \
diff --git a/configure.ac b/configure.ac
index ce41489..78484ed 100755
--- a/configure.ac
+++ b/configure.ac
@@ -399,6 +399,7 @@ AC_CONFIG_FILES([
etc/upgrade/split-out-cf-categories
etc/upgrade/generate-rtaddressregexp
sbin/rt-attributes-viewer
+ sbin/rt-session-viewer
sbin/rt-dump-database
sbin/rt-setup-database
sbin/rt-test-dependencies
diff --git a/sbin/rt-session-viewer.in b/sbin/rt-session-viewer.in
new file mode 100644
index 0000000..e11e3d4
--- /dev/null
+++ b/sbin/rt-session-viewer.in
@@ -0,0 +1,121 @@
+#!@PERL@
+# BEGIN BPS TAGGED BLOCK {{{
+#
+# COPYRIGHT:
+#
+# This software is Copyright (c) 1996-2010 Best Practical Solutions, LLC
+# <jesse at bestpractical.com>
+#
+# (Except where explicitly superseded by other copyright notices)
+#
+#
+# LICENSE:
+#
+# This work is made available to you under the terms of Version 2 of
+# the GNU General Public License. A copy of that license should have
+# been provided with this software, but in any event can be snarfed
+# from www.gnu.org.
+#
+# This work is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301 or visit their web page on the internet at
+# http://www.gnu.org/licenses/old-licenses/gpl-2.0.html.
+#
+#
+# CONTRIBUTION SUBMISSION POLICY:
+#
+# (The following paragraph is not intended to limit the rights granted
+# to you to modify and distribute this software under the terms of
+# the GNU General Public License and is only of importance to you if
+# you choose to contribute your changes and enhancements to the
+# community by submitting them to Best Practical Solutions, LLC.)
+#
+# By intentionally submitting any modifications, corrections or
+# derivatives to this work, or any other work intended for use with
+# Request Tracker, to Best Practical Solutions, LLC, you confirm that
+# you are the copyright holder for those contributions and you grant
+# Best Practical Solutions, LLC a nonexclusive, worldwide, irrevocable,
+# royalty-free, perpetual, license to use, copy, create derivative
+# works based on those contributions, and sublicense and distribute
+# those contributions and any derivatives thereof.
+#
+# END BPS TAGGED BLOCK }}}
+use strict;
+use warnings;
+
+# fix lib paths, some may be relative
+BEGIN {
+ require File::Spec;
+ my @libs = ("@RT_LIB_PATH@", "@LOCAL_LIB_PATH@");
+ my $bin_path;
+
+ for my $lib (@libs) {
+ unless ( File::Spec->file_name_is_absolute($lib) ) {
+ unless ($bin_path) {
+ if ( File::Spec->file_name_is_absolute(__FILE__) ) {
+ $bin_path = ( File::Spec->splitpath(__FILE__) )[1];
+ }
+ else {
+ require FindBin;
+ no warnings "once";
+ $bin_path = $FindBin::Bin;
+ }
+ }
+ $lib = File::Spec->catfile( $bin_path, File::Spec->updir, $lib );
+ }
+ unshift @INC, $lib;
+ }
+}
+
+use Getopt::Long;
+my %opt;
+GetOptions( \%opt, 'help|h', );
+
+my $session_id = shift;
+
+if ( $opt{help} || !$session_id ) {
+ require Pod::Usage;
+ Pod::Usage::pod2usage({ verbose => 2 });
+ exit;
+}
+
+require RT;
+RT::LoadConfig();
+RT::Init();
+
+require RT::Interface::Web::Session;
+my %session;
+
+tie %session, 'RT::Interface::Web::Session', $session_id;
+unless ( $session{'_session_id'} eq $session_id ) {
+ print STDERR "Couldn't load session $session_id\n";
+ exit 1;
+}
+
+use Data::Dumper;
+print "Content of session $session_id: ". Dumper( \%session);
+
+__END__
+
+=head1 NAME
+
+rt-session-viewer - show the content of a user's session
+
+=head1 SYNOPSIS
+
+ # show the content of session
+ rt-attributes-viewer
+
+=head1 DESCRIPTION
+
+This script deserializes and print content of a session identified
+by <session id>. May be useful for developers and for troubleshooting
+problems.
+
+=cut
commit e7c5cdad0b72164fb290784c7c6cae7585607516
Author: Kevin Falcone <falcone at bestpractical.com>
Date: Fri Sep 10 18:11:26 2010 -0400
Add a new QueueCacheNeedsUpdate check
For now, this just returns 0 so we never update the cache,
but it will correctly update an existing session.
diff --git a/lib/RT/System.pm b/lib/RT/System.pm
index 8bee2d8..c2607a4 100755
--- a/lib/RT/System.pm
+++ b/lib/RT/System.pm
@@ -241,6 +241,17 @@ sub SubjectTag {
return grep !$seen{lc $_}++, values %$map;
}
+sub QueueCacheNeedsUpdate {
+ my $self = shift;
+ my $update = shift;
+
+ if ($update) {
+ return $self->SetAttribute('QueueCacheNeedsUpdate', $update);
+ } else {
+ return $self->FirstAttribute('QueueCacheNeedsUpdate') || 0;
+ }
+}
+
RT::Base->_ImportOverlays();
1;
diff --git a/share/html/Elements/SelectQueue b/share/html/Elements/SelectQueue
index 8404d54..ebe3f65 100755
--- a/share/html/Elements/SelectQueue
+++ b/share/html/Elements/SelectQueue
@@ -55,7 +55,7 @@
% if ($ShowNullOption) {
<option value=""><% $DefaultLabel %></option>
% }
-% for my $queue (@{$session{$cache_key}}) {
+% for my $queue (@{$session{$cache_key}{queues}}) {
<option value="<% ($NamedValues ? $queue->{Name} : $queue->{Id}) %>"\
% if ($queue->{Id} eq ($Default||'') || $queue->{Name} eq ($Default||'')) {
selected="selected"\
@@ -88,18 +88,27 @@ my $cache_key = "SelectQueue---"
. $session{'CurrentUser'}->Id
. "---$CheckQueueRight---$ShowAllQueues";
-if (not defined $session{$cache_key} and not $Lite) {
+if ( defined $session{$cache_key} && ref $session{$cache_key} eq 'ARRAY') {
+ delete $session{$cache_key};
+}
+if ( defined $session{$cache_key} &&
+ $session{$cache_key}{lastupdated} < $RT::System->QueueCacheNeedsUpdate ) {
+ delete $session{$cache_key};
+}
+
+if ( not defined $session{$cache_key} and not $Lite ) {
my $q = RT::Queues->new($session{'CurrentUser'});
$q->UnLimit;
while (my $queue = $q->Next) {
if ($ShowAllQueues || $queue->CurrentUserHasRight($CheckQueueRight)) {
- push @{$session{$cache_key}}, {
+ push @{$session{$cache_key}{queues}}, {
Id => $queue->Id,
Name => $queue->Name,
Description => $queue->Description,
};
}
}
+ $session{$cache_key}{lastupdated} = time();
}
</%init>
-----------------------------------------------------------------------
More information about the Rt-commit
mailing list