Skip to content

Commit 8aa2909

Browse files
janLojanLo
committed
fix: replace ILogger with LoggerInterface
This replaces the long deprecated and now removed ILogger with LoggerInterface as done in nextcloud/server#40145. This fixes jgraph#90
1 parent 809d034 commit 8aa2909

6 files changed

Lines changed: 31 additions & 26 deletions

File tree

‎lib/AppConfig.php‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@
1212
namespace OCA\Drawio;
1313

1414
use OCP\IConfig;
15-
use OCP\ILogger;
16-
15+
use Psr\Log\LoggerInterface;
1716

1817
class AppConfig {
1918

@@ -48,7 +47,7 @@ public function __construct($AppName)
4847
$this->appName = $AppName;
4948

5049
$this->config = \OC::$server->getConfig();
51-
$this->logger = \OC::$server->getLogger();
50+
$this->logger = \OC::$server->get(LoggerInterface::class);
5251
}
5352

5453
public function SetDrawioUrl($drawio)

‎lib/AppInfo/Application.php‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@
2727
use OCP\EventDispatcher\IEventDispatcher;
2828
use OCP\Files\Events\Node\NodeDeletedEvent;
2929
use OCP\Files\IAppData;
30+
use Psr\Log\LoggerInterface;
31+
3032

3133
class Application extends App {
3234

@@ -73,7 +75,7 @@ public function __construct(array $urlParams = [])
7375

7476
$container->registerService("Logger", function($c)
7577
{
76-
return $c->query("ServerContainer")->getLogger();
78+
return $c->query("ServerContainer")->get(LoggerInterface::class);
7779
});
7880

7981

‎lib/Controller/EditorController.php‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,14 @@
2323
use OCP\Files\FileInfo;
2424
use OCP\Files\IRootFolder;
2525
use OCP\IL10N;
26-
use OCP\ILogger;
2726
use OCP\IRequest;
2827
use OCP\ISession;
2928
use OCP\IURLGenerator;
3029
use OCP\IUserSession;
3130
use OCP\Share\Exceptions\ShareNotFound;
3231
use OCP\Share\IManager;
32+
use Psr\Log\LoggerInterface;
33+
use Psr\Log\LogLevel;
3334

3435
use OC\Files\Filesystem;
3536
use OC\Files\View;
@@ -100,7 +101,7 @@ class EditorController extends Controller
100101
* @param IUserSession $userSession - current user session
101102
* @param IURLGenerator $urlGenerator - url generator service
102103
* @param IL10N $trans - l10n service
103-
* @param ILogger $logger - logger
104+
* @param LoggerInterface $logger - logger
104105
* @param OCA\Drawio\AppConfig $config - app config
105106
*/
106107
public function __construct($AppName,
@@ -109,7 +110,7 @@ public function __construct($AppName,
109110
IUserSession $userSession,
110111
IURLGenerator $urlGenerator,
111112
IL10N $trans,
112-
ILogger $logger,
113+
LoggerInterface $logger,
113114
AppConfig $config,
114115
IManager $shareManager,
115116
ISession $session,
@@ -178,7 +179,7 @@ public function loadFileVersion($fileId, $revId)
178179
{
179180
return $this->loadInternal($fileId, null, true);
180181
} catch (\Exception $e) {
181-
$this->logger->logException($e, ["message" => "Can't load file version: $fileId, $revId", "app" => $this->appName]);
182+
$this->logger->error($e->getMessage(), ["message" => "Can't load file version: $fileId, $revId", "app" => $this->appName, 'level' => LogLevel::ERROR, 'exception' => $e]);
182183
$message = (string)$this->trans->t('An internal server error occurred.');
183184
return new DataResponse(['message' => $message], Http::STATUS_INTERNAL_SERVER_ERROR);
184185
}
@@ -225,7 +226,7 @@ public function getFileRevisions($fileId)
225226
return new DataResponse(['message' => (string)$this->trans->t('Invalid fileId supplied.')], Http::STATUS_BAD_REQUEST);
226227
}
227228
} catch (\Exception $e) {
228-
$this->logger->logException($e, ["message" => "Can't get file versions: $fileId", "app" => $this->appName]);
229+
$this->logger->error($e->getMessage(), ["message" => "Can't get file versions: $fileId", "app" => $this->appName, 'level' => LogLevel::ERROR, 'exception' => $e]);
229230
$message = (string)$this->trans->t('An internal server error occurred.');
230231
return new DataResponse(['message' => $message], Http::STATUS_INTERNAL_SERVER_ERROR);
231232
}
@@ -314,7 +315,7 @@ private function loadInternal($fileId, $shareToken, $contentsOnly)
314315
$message = (string)$e->getHint();
315316
return new DataResponse(['message' => $message], Http::STATUS_INTERNAL_SERVER_ERROR);
316317
} catch (\Exception $e) {
317-
$this->logger->logException($e, ["message" => "Can't load file: $fileId , $shareToken", "app" => $this->appName]);
318+
$this->logger->error($e->getMessage(), ["message" => "Can't load file: $fileId , $shareToken", "app" => $this->appName, 'level' => LogLevel::ERROR, 'exception' => $e]);
318319
$message = (string)$this->trans->t('An internal server error occurred.');
319320
return new DataResponse(['message' => $message], Http::STATUS_INTERNAL_SERVER_ERROR);
320321
}
@@ -382,7 +383,7 @@ public function getFileInfo($fileId, $shareToken)
382383
$message = (string)$e->getHint();
383384
return new DataResponse(['message' => $message], Http::STATUS_INTERNAL_SERVER_ERROR);
384385
} catch (\Exception $e) {
385-
$this->logger->logException($e, ["message" => "Can't get file info: $fileId , $shareToken", "app" => $this->appName]);
386+
$this->logger->error($e->getMessage(), ["message" => "Can't get file info: $fileId , $shareToken", "app" => $this->appName, 'level' => LogLevel::ERROR, 'exception' => $e]);
386387
$message = (string)$this->trans->t('An internal server error occurred.');
387388
return new DataResponse(['message' => $message], Http::STATUS_INTERNAL_SERVER_ERROR);
388389
}
@@ -486,7 +487,7 @@ public function save($fileId, $shareToken, $fileContents, $etag)
486487
$message = (string)$e->getHint();
487488
return new DataResponse(['message' => $message], Http::STATUS_INTERNAL_SERVER_ERROR);
488489
} catch (\Exception $e) {
489-
$this->logger->logException($e, ["message" => "Can't save file: $fileId , $shareToken", "app" => $this->appName]);
490+
$this->logger->error($e->getMessage(), ["message" => "Can't save file: $fileId , $shareToken", "app" => $this->appName, 'level' => LogLevel::ERROR, 'exception' => $e]);
490491
$message = (string)$this->trans->t('An internal server error occurred.');
491492
return new DataResponse(['message' => $message], Http::STATUS_INTERNAL_SERVER_ERROR);
492493
}
@@ -539,7 +540,7 @@ public function savePreview($fileId, $shareToken, $previewContents)
539540
}
540541
catch (\Exception $e)
541542
{
542-
$this->logger->logException($e, ["message" => "Can't save preview for file: $fileId , $shareToken", "app" => $this->appName]);
543+
$this->logger->error($e->getMessage(), ["message" => "Can't save preview for file: $fileId , $shareToken", "app" => $this->appName, 'level' => LogLevel::ERROR, 'exception' => $e]);
543544
$message = (string)$this->trans->t('An internal server error occurred.');
544545
return new DataResponse(['message' => $message], Http::STATUS_INTERNAL_SERVER_ERROR);
545546
}
@@ -576,7 +577,7 @@ public function create($name, $dir)
576577
}
577578
catch (NotPermittedException $e)
578579
{
579-
$this->logger->logException($e, ["message" => "Can't create file: $name", "app" => $this->appName]);
580+
$this->logger->error($e->getMessage(), ["message" => "Can't create file: $name", "app" => $this->appName, 'level' => LogLevel::ERROR, 'exception' => $e]);
580581
return ["error" => $this->trans->t("Can't create file")];
581582
}
582583

‎lib/Controller/SettingsController.php‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,9 @@
1515
use OCP\AppFramework\Controller;
1616
use OCP\AppFramework\Http\TemplateResponse;
1717
use OCP\IL10N;
18-
use OCP\ILogger;
1918
use OCP\IRequest;
19+
use Psr\Log\LoggerInterface;
20+
use Psr\Log\LogLevel;
2021

2122
use OCA\Drawio\AppConfig;
2223
use OCA\Drawio\Migration;
@@ -33,13 +34,13 @@ class SettingsController extends Controller
3334
* @param string $AppName - application name
3435
* @param IRequest $request - request object
3536
* @param IL10N $trans - l10n service
36-
* @param ILogger $logger - logger
37+
* @param LoggerInterface $logger - logger
3738
* @param OCA\Drawio\AppConfig $config - application configuration
3839
*/
3940
public function __construct($AppName,
4041
IRequest $request,
4142
IL10N $trans,
42-
ILogger $logger,
43+
LoggerInterface $logger,
4344
AppConfig $config
4445
)
4546
{

‎lib/Listeners/FileDeleteListener.php‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,18 @@
88
use OCP\Files\Folder;
99
use OCP\Files\IAppData;
1010
use OCP\Files\NotFoundException;
11-
use OCP\ILogger;
11+
use Psr\Log\LoggerInterface;
12+
use Psr\Log\LogLevel;
1213

1314
class FileDeleteListener implements IEventListener {
1415

15-
/** @var ILogger */
16+
/** @var LoggerInterface */
1617
private $logger;
1718

1819
/** @var IAppData */
1920
private $appData;
2021

21-
public function __construct(ILogger $logger, IAppData $appData)
22+
public function __construct(LoggerInterface $logger, IAppData $appData)
2223
{
2324
$this->logger = $logger;
2425
$this->appData = $appData;
@@ -47,7 +48,7 @@ public function handle(Event $event): void {
4748
catch (\Exception $e)
4849
{
4950
// ignore
50-
$this->logger->logException($e, ["message" => "Can't delete preview for file: " . $node->getPath(), "app" => 'drawio']);
51+
$this->logger->error($e->getMessage(), ["message" => "Can't delete preview for file: " . $node->getPath(), "app" => 'drawio', 'level' => LogLevel::ERROR, 'exception' => $e]);
5152
}
5253
}
53-
}
54+
}

‎lib/Preview/DrawioPreview.php‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,9 @@
99
use OCP\Files\FileInfo;
1010
use OCP\Files\IAppData;
1111
use OCP\Files\NotFoundException;
12-
use OCP\ILogger;
1312
use OCP\Image;
13+
use Psr\Log\LoggerInterface;
14+
use Psr\Log\LogLevel;
1415

1516
use OCA\Drawio\AppConfig;
1617

@@ -32,7 +33,7 @@ class DrawioPreview extends Provider
3233
"application/x-drawio-wb"
3334
];
3435

35-
public function __construct(ILogger $logger, IAppData $appData)
36+
public function __construct(LoggerInterface $logger, IAppData $appData)
3637
{
3738
$this->logger = $logger;
3839
$this->appData = $appData;
@@ -101,8 +102,8 @@ private function getPreviewFile($fileId)
101102
}
102103
catch (\Exception $e)
103104
{
104-
$this->logger->logException($e, ["message" => "Can't get preview file", "app" => $this->appName]);
105+
$this->logger->error($e->getMessage(), ["message" => "Can't get preview file", "app" => $this->appName, 'level' => LogLevel::ERROR, 'exception' => $e]);
105106
return false;
106107
}
107108
}
108-
}
109+
}

0 commit comments

Comments
 (0)