Merge pull request #7643 from JakubOnderka/pubsub-static

chg: [internal] Convert PubSubTool to static
pull/7598/head
Jakub Onderka 2021-08-11 12:21:59 +02:00 committed by GitHub
commit e40b4307b9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 9 deletions

View File

@ -29,16 +29,14 @@ class AppModel extends Model
{
public $name;
/**
* @var PubSubTool
*/
private $loadedPubSubTool;
/** @var PubSubTool */
private static $loadedPubSubTool;
/** @var KafkaPubTool */
public $loadedKafkaPubTool;
private $loadedKafkaPubTool;
/** @var null|Redis */
private static $__redisConnection = null;
private static $__redisConnection;
private $__profiler = array();
@ -2568,15 +2566,18 @@ class AppModel extends Model
}
}
/**
* @return PubSubTool
*/
public function getPubSubTool()
{
if (!$this->loadedPubSubTool) {
if (!self::$loadedPubSubTool) {
App::uses('PubSubTool', 'Tools');
$pubSubTool = new PubSubTool();
$pubSubTool->initTool();
$this->loadedPubSubTool = $pubSubTool;
self::$loadedPubSubTool = $pubSubTool;
}
return $this->loadedPubSubTool;
return self::$loadedPubSubTool;
}
public function getElasticSearchTool()