Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
bugzilla
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
etersoft
bugzilla
Commits
c19dc4ff
Commit
c19dc4ff
authored
Aug 12, 2014
by
Byron Jones
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Bug 993926: Bugzilla::User::Setting::get_all_settings() should use memcached
r=sgreen,a=glob
parent
8b989123
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
47 additions
and
11 deletions
+47
-11
Memcached.pm
Bugzilla/Memcached.pm
+13
-1
Setting.pm
Bugzilla/User/Setting.pm
+31
-10
editsettings.cgi
editsettings.cgi
+1
-0
userprefs.cgi
userprefs.cgi
+2
-0
No files found.
Bugzilla/Memcached.pm
View file @
c19dc4ff
...
...
@@ -254,10 +254,13 @@ sub _get {
elsif
(
ref
(
$value
)
eq
'ARRAY'
)
{
foreach
my
$value
(
@$value
)
{
next
unless
defined
$value
;
# arrays of hashes are common
# arrays of hashes a
nd arrays a
re common
if
(
ref
(
$value
)
eq
'HASH'
)
{
_detaint_hashref
(
$value
);
}
elsif
(
ref
(
$value
)
eq
'ARRAY'
)
{
_detaint_arrayref
(
$value
);
}
elsif
(
!
ref
(
$value
))
{
trick_taint
(
$value
);
}
...
...
@@ -278,6 +281,15 @@ sub _detaint_hashref {
}
}
sub
_detaint_arrayref
{
my
(
$arrayref
)
=
@_
;
foreach
my
$value
(
@$arrayref
)
{
if
(
defined
(
$value
)
&&
!
ref
(
$value
))
{
trick_taint
(
$value
);
}
}
}
sub
_delete
{
my
(
$self
,
$key
)
=
@_
;
$key
=
$self
->
_encode_key
(
$key
)
...
...
Bugzilla/User/Setting.pm
View file @
c19dc4ff
...
...
@@ -15,8 +15,12 @@ use parent qw(Exporter);
# Module stuff
@
Bugzilla::User::Setting::
EXPORT
=
qw(get_all_settings get_defaults
add_setting)
;
@
Bugzilla::User::Setting::
EXPORT
=
qw(
get_all_settings
get_defaults
add_setting
clear_settings_cache
)
;
use
Bugzilla::
Error
;
use
Bugzilla::
Util
qw(trick_taint get_text)
;
...
...
@@ -159,15 +163,20 @@ sub get_all_settings {
my
$settings
=
{};
my
$dbh
=
Bugzilla
->
dbh
;
my
$rows
=
$dbh
->
selectall_arrayref
(
q{SELECT name, default_value, is_enabled, setting_value, subclass
FROM setting
LEFT JOIN profile_setting
ON setting.name = profile_setting.setting_name
AND profile_setting.user_id = ?}
,
undef
,
(
$user_id
));
my
$cache_key
=
"user_settings.$user_id"
;
my
$rows
=
Bugzilla
->
memcached
->
get_config
({
key
=>
$cache_key
});
if
(
!
$rows
)
{
$rows
=
$dbh
->
selectall_arrayref
(
q{SELECT name, default_value, is_enabled, setting_value, subclass
FROM setting
LEFT JOIN profile_setting
ON setting.name = profile_setting.setting_name
AND profile_setting.user_id = ?}
,
undef
,
(
$user_id
));
Bugzilla
->
memcached
->
set_config
({
key
=>
$cache_key
,
data
=>
$rows
});
}
foreach
my
$row
(
@$rows
)
{
my
(
$name
,
$default_value
,
$is_enabled
,
$value
,
$subclass
)
=
@$row
;
my
(
$name
,
$default_value
,
$is_enabled
,
$value
,
$subclass
)
=
@$row
;
my
$is_default
;
...
...
@@ -179,13 +188,18 @@ sub get_all_settings {
}
$settings
->
{
$name
}
=
new
Bugzilla::User::
Setting
(
$name
,
$user_id
,
$is_enabled
,
$name
,
$user_id
,
$is_enabled
,
$default_value
,
$value
,
$is_default
,
$subclass
);
}
return
$settings
;
}
sub
clear_settings_cache
{
my
(
$user_id
)
=
@_
;
Bugzilla
->
memcached
->
clear_config
({
key
=>
"user_settings.$user_id"
});
}
sub
get_defaults
{
my
(
$user_id
)
=
@_
;
my
$dbh
=
Bugzilla
->
dbh
;
...
...
@@ -368,6 +382,13 @@ Params: C<$setting_name> - string - the name of the setting
C<$is_enabled> - boolean - if false, all users must use the global default
Returns: nothing
=item C<clear_settings_cache($user_id)>
Description: Clears cached settings data for the specified user. Must be
called after updating any user's setting.
Params: C<$user_id> - integer - the user id.
Returns: nothing
=begin private
=item C<_setting_exists>
...
...
editsettings.cgi
View file @
c19dc4ff
...
...
@@ -53,6 +53,7 @@ if ($action eq 'update') {
}
$vars
->
{
'message'
}
=
'default_settings_updated'
;
$vars
->
{
'changes_saved'
}
=
$changed
;
Bugzilla
->
memcached
->
clear_config
();
delete_token
(
$token
);
}
...
...
userprefs.cgi
View file @
c19dc4ff
...
...
@@ -19,6 +19,7 @@ use Bugzilla::Util;
use
Bugzilla::
Error
;
use
Bugzilla::
User
;
use
Bugzilla::User::
APIKey
;
use
Bugzilla::User::
Setting
qw(clear_settings_cache)
;
use
Bugzilla::
Token
;
my
$template
=
Bugzilla
->
template
;
...
...
@@ -170,6 +171,7 @@ sub SaveSettings {
}
}
$vars
->
{
'settings'
}
=
$user
->
settings
(
1
);
clear_settings_cache
(
$user
->
id
);
}
sub
DoEmail
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment