aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--perllib/FixMyStreet/App.pm2
-rw-r--r--perllib/Memcached.pm14
2 files changed, 4 insertions, 12 deletions
diff --git a/perllib/FixMyStreet/App.pm b/perllib/FixMyStreet/App.pm
index e23bc7622..590daa170 100644
--- a/perllib/FixMyStreet/App.pm
+++ b/perllib/FixMyStreet/App.pm
@@ -232,8 +232,6 @@ sub setup_request {
$c->model('DB::Problem')->set_restriction( $cobrand->site_key() );
- Memcached::set_namespace( FixMyStreet->config('FMS_DB_NAME') . ":" );
-
FixMyStreet::Map::set_map_class( $cobrand->map_type || $c->get_param('map_override') );
# All pages need this, either loading it or prefetching it
$c->stash->{map_js} = FixMyStreet::Map::map_javascript();
diff --git a/perllib/Memcached.pm b/perllib/Memcached.pm
index 150594a01..63f22a645 100644
--- a/perllib/Memcached.pm
+++ b/perllib/Memcached.pm
@@ -1,21 +1,15 @@
-#
# Memcached.pm:
-# Trying out memcached on FixMyStreet
-#
-# Copyright (c) 2008 UK Citizens Online Democracy. All rights reserved.
-# Email: matthew@mysociety.org; WWW: http://www.mysociety.org/
+# Tiny FixMyStreet memcached wrapper
package Memcached;
use strict;
use warnings;
use Cache::Memcached;
+use FixMyStreet;
-my ($memcache, $namespace);
-
-sub set_namespace {
- $namespace = shift;
-}
+my $memcache;
+my $namespace = FixMyStreet->config('FMS_DB_NAME') . ":";
sub instance {
return $memcache //= Cache::Memcached->new({