Skip to content

Commit 05d2c3c

Browse files
authored
Merge pull request #11 from gaobinzhan/master
Fix: Setting adapter does not take effect && Log processor.
2 parents 28dc2d2 + 9b20c85 commit 05d2c3c

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

src/Casbin.php

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -116,15 +116,15 @@ public function __construct(?Config $config = null)
116116

117117
$this->config = $config;
118118

119-
if (!$config->getAdapter() instanceof Adapter) {
120-
$this->adapter = new DatabaseAdapter();
121-
}
122-
123-
if ($logger = $this->config->getLoggerClass() ?? 'EasySwoole\Permission\Logger') {
124-
if (class_exists($logger)) {
125-
$logger = $logger::getInstance();
119+
$this->adapter = $config->getAdapter() ?? new DatabaseAdapter();
120+
121+
if ($loggerClass = $this->config->getLoggerClass()) {
122+
$refClass = new \ReflectionClass($loggerClass);
123+
if ($refClass->isSubclassOf(\Casbin\Log\Logger::class)) {
124+
/** @var \Casbin\Log\Logger $logger */
125+
$logger = $refClass->newInstance();
126+
Log::setLogger($logger);
126127
}
127-
Log::setLogger($logger);
128128
}
129129

130130
$this->model = new Model();

src/Config.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ class Config
4040
/**
4141
* @var string
4242
*/
43-
protected $logger_class = 'EasySwoole\Permission\Logger';
43+
protected $logger_class = Logger::class;
4444

4545
/**
4646
* @return string

0 commit comments

Comments
 (0)