Skip to content
Snippets Groups Projects
Commit 01226dd4 authored by ale's avatar ale
Browse files

Merge branch 'memcache-object-cache' into 'master'

Add the memcached plugin (object caching)

See merge request !209
parents 8dcff28b 468c3e6c
Branches
No related tags found
1 merge request!209Add the memcached plugin (object caching)
...@@ -131,7 +131,8 @@ ...@@ -131,7 +131,8 @@
"wpackagist-plugin/event-organiser": "3.12.1", "wpackagist-plugin/event-organiser": "3.12.1",
"noblogs/ai-authenticate-rest-api-plugin": "0.0.3", "noblogs/ai-authenticate-rest-api-plugin": "0.0.3",
"wpackagist-plugin/multisite-custom-css": "1.0", "wpackagist-plugin/multisite-custom-css": "1.0",
"wpackagist-plugin/activitypub": "0.13.4" "wpackagist-plugin/activitypub": "0.13.4",
"wpackagist-plugin/memcached": "4.0.0"
}, },
"extra": { "extra": {
"wordpress-install-dir": "app", "wordpress-install-dir": "app",
...@@ -198,7 +199,8 @@ ...@@ -198,7 +199,8 @@
], ],
"app/wp-content": [ "app/wp-content": [
"package:stuttter/ludicrousdb:ludicrousdb/drop-ins/db.php,ludicrousdb/drop-ins/db-error.php", "package:stuttter/ludicrousdb:ludicrousdb/drop-ins/db.php,ludicrousdb/drop-ins/db-error.php",
"package:wpackagist-plugin/wp-super-cache:advanced-cache.php" "package:wpackagist-plugin/wp-super-cache:advanced-cache.php",
"package:wpackagist-plugin/memcached:object-cache.php"
], ],
"app": [ "app": [
"package:noblogs/r2db:db-config.php,nginx-map/wp-nginx-map-json.php,nginx-map/wp-nginx-map.php" "package:noblogs/r2db:db-config.php,nginx-map/wp-nginx-map-json.php,nginx-map/wp-nginx-map.php"
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "48f8128868e7383a16584bf851085bcb", "content-hash": "f3588bfe722e90bd8a683069b0a906bf",
"packages": [ "packages": [
{ {
"name": "bjornjohansen/wplang", "name": "bjornjohansen/wplang",
...@@ -1116,6 +1116,24 @@ ...@@ -1116,6 +1116,24 @@
"type": "wordpress-plugin", "type": "wordpress-plugin",
"homepage": "https://wordpress.org/plugins/katex/" "homepage": "https://wordpress.org/plugins/katex/"
}, },
{
"name": "wpackagist-plugin/memcached",
"version": "4.0.0",
"source": {
"type": "svn",
"url": "https://plugins.svn.wordpress.org/memcached/",
"reference": "tags/4.0.0"
},
"dist": {
"type": "zip",
"url": "https://downloads.wordpress.org/plugin/memcached.4.0.0.zip"
},
"require": {
"composer/installers": "^1.0 || ^2.0"
},
"type": "wordpress-plugin",
"homepage": "https://wordpress.org/plugins/memcached/"
},
{ {
"name": "wpackagist-plugin/more-privacy-options", "name": "wpackagist-plugin/more-privacy-options",
"version": "4.6", "version": "4.6",
...@@ -2171,5 +2189,5 @@ ...@@ -2171,5 +2189,5 @@
"php": ">=7.1" "php": ">=7.1"
}, },
"platform-dev": [], "platform-dev": [],
"plugin-api-version": "2.3.0" "plugin-api-version": "2.0.0"
} }
...@@ -22,6 +22,7 @@ PACKAGES=" ...@@ -22,6 +22,7 @@ PACKAGES="
php-imagick php-imagick
php-intl php-intl
php-mysql php-mysql
php-memcache
php-memcached php-memcached
php-mbstring php-mbstring
php-xml php-xml
......
...@@ -158,6 +158,15 @@ define ('WPLANG', ''); ...@@ -158,6 +158,15 @@ define ('WPLANG', '');
/* NoSpam API endpoint (internal). */ /* NoSpam API endpoint (internal). */
define('NOSPAM_API_URL', 'http://nospam.investici.org:9001'); define('NOSPAM_API_URL', 'http://nospam.investici.org:9001');
/*
* Memcache servers for Wordpress object caching.
*/
$memcached_servers = array(
'default' => array(
'127.0.0.1:7108'
)
);
/* /*
* A/I Patch: get more replicas of the partitions in the flexihash calculations. * A/I Patch: get more replicas of the partitions in the flexihash calculations.
*/ */
...@@ -171,6 +180,18 @@ if (array_key_exists('debug_cookie_name', $noblogs_config) && ...@@ -171,6 +180,18 @@ if (array_key_exists('debug_cookie_name', $noblogs_config) &&
define('WP_DEBUG', true); define('WP_DEBUG', true);
define('WP_DEBUG_LOG', true); define('WP_DEBUG_LOG', true);
define('WP_DEBUG_DISPLAY', false); define('WP_DEBUG_DISPLAY', false);
// Warning handler that dumps stack traces.
class WarningWithStacktrace extends ErrorException {}
set_error_handler(function($severity, $message, $file, $line) {
if ($severity & (E_WARNING | E_NOTICE | E_USER_WARNING | E_USER_NOTICE)) {
$ex = new WarningWithStacktrace($message, 0, $severity, $file, $line);
error_log("\n" . $ex. "\n");
return true;
}
return false;
});
} else { } else {
define('WP_DEBUG', false); define('WP_DEBUG', false);
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment