diff options
| author | Joas Schilling <coding@schilljs.com> | 2021-10-01 16:08:02 +0200 |
|---|---|---|
| committer | Joas Schilling <coding@schilljs.com> | 2021-10-04 19:02:13 +0200 |
| commit | 04b368f2bd6611dfbf1aa72d7e543a1ff86d922e (patch) | |
| tree | 8fd7a66ae7a4cbab2262111fe10a7498e544e77b /lib | |
| parent | 857c769d7557aa7d925147ffa69012aa5f72495c (diff) | |
| download | nextcloud-server-04b368f2bd6611dfbf1aa72d7e543a1ff86d922e.tar.gz nextcloud-server-04b368f2bd6611dfbf1aa72d7e543a1ff86d922e.zip | |
Improve log and allow duplicate notifications section
Signed-off-by: Joas Schilling <coding@schilljs.com>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/Settings/Manager.php | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/lib/private/Settings/Manager.php b/lib/private/Settings/Manager.php index 6c567204253..ebda3fe021d 100644 --- a/lib/private/Settings/Manager.php +++ b/lib/private/Settings/Manager.php @@ -131,8 +131,9 @@ class Manager implements IManager { $sectionID = $section->getID(); - if ($sectionID !== 'connected-accounts' && isset($this->sections[$type][$sectionID])) { - $this->log->info('', ['exception' => new \InvalidArgumentException('Section with the same ID already registered: ' . $sectionID . ', class: ' . $class)]); + if (!$this->isKnownDuplicateSectionId($sectionID) && isset($this->sections[$type][$sectionID])) { + $e = new \InvalidArgumentException('Section with the same ID already registered: ' . $sectionID . ', class: ' . $class); + $this->log->info($e->getMessage(), ['exception' => $e]); continue; } @@ -144,6 +145,13 @@ class Manager implements IManager { return $this->sections[$type]; } + protected function isKnownDuplicateSectionId(string $sectionID): bool { + return in_array($sectionID, [ + 'connected-accounts', + 'notifications', + ], true); + } + /** @var array */ protected $settingClasses = []; @@ -190,7 +198,8 @@ class Manager implements IManager { } if (!$setting instanceof ISettings) { - $this->log->info('', ['exception' => new \InvalidArgumentException('Invalid settings setting registered (' . $class . ')')]); + $e = new \InvalidArgumentException('Invalid settings setting registered (' . $class . ')'); + $this->log->info($e->getMessage(), ['exception' => $e]); continue; } |