From a9ae96fa4c7c36638992a7fbefeaa0d0bf84f4e2 Mon Sep 17 00:00:00 2001
From: Alexei Sorokin <sor.alexei@meowr.ru>
Date: Thu, 13 Aug 2020 22:51:22 +0300
Subject: [PATCH] [Memcached] Do not set persistent connections for daemons

---
 plugins/Memcached/MemcachedPlugin.php | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/plugins/Memcached/MemcachedPlugin.php b/plugins/Memcached/MemcachedPlugin.php
index a806298a22..266c5d9675 100644
--- a/plugins/Memcached/MemcachedPlugin.php
+++ b/plugins/Memcached/MemcachedPlugin.php
@@ -47,6 +47,8 @@ class MemcachedPlugin extends Plugin
     public $servers = ['127.0.0.1'];
     public $defaultExpiry = 86400; // 24h
 
+    protected $persistent = null;
+
     private $_conn = null;
 
     /**
@@ -56,7 +58,7 @@ class MemcachedPlugin extends Plugin
      *
      * @return bool flag value
      */
-    public function initialize(): bool
+    public function onInitializePlugin(): bool
     {
         if (self::$cacheInitialized) {
             $this->persistent = true;
@@ -216,7 +218,13 @@ class MemcachedPlugin extends Plugin
     private function _ensureConn(): void
     {
         if (empty($this->_conn)) {
-            $this->_conn = new Memcached(common_config('site', 'nickname'));
+            if ($this->persistent) {
+                $this->_conn = new Memcached(
+                    'gnusocial:' . common_config('site', 'nickname')
+                );
+            } else {
+                $this->_conn = new Memcached();
+            }
 
             if (!count($this->_conn->getServerList())) {
                 if (is_array($this->servers)) {