adjust to changes from server/#9293

most old static classes are gone, and essentially there is just one
standard log file (if in use).

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>

1 files changed, 19 insertions, 10 deletions

diff --git a/lib/Controller/LogController.php b/lib/Controller/LogController.php
index f0ab2fc..c77cba7 100644
--- a/lib/Controller/LogController.php
+++ b/lib/Controller/LogController.php
@@ -28,6 +28,8 @@ use OCP\AppFramework\Http\JSONResponse;
 use OCP\AppFramework\Http\TemplateResponse;
 use OCP\IConfig;
 use OCP\IRequest;
+use OCP\Log\IFileBased;
+use OCP\Log\ILogFactory;
 
 /**
  * Class LogController
@@ -39,26 +41,33 @@ class LogController extends Controller {
 	 * @var IConfig
 	 */
 	private $config;
+	/** @var ILogFactory */
+	private $logFactory;
 
 	public function __construct($appName,
 								IRequest $request,
-								IConfig $config) {
+								IConfig $config,
+								ILogFactory $logFactory
+	) {
 		parent::__construct($appName, $request);
 		$this->config = $config;
+		$this->logFactory = $logFactory;
 	}
 
+	/**
+	 * @return LogIterator
+	 * @throws \Exception
+	 */
 	private function getLogIterator() {
 		$dateFormat = $this->config->getSystemValue('logdateformat', \DateTime::ATOM);
 		$timezone = $this->config->getSystemValue('logtimezone', 'UTC');
-		$logClasses = ['\OC\Log\Owncloud', '\OC_Log_Owncloud', '\OC\Log\File'];
-		foreach ($logClasses as $logClass) {
-			if (class_exists($logClass)) {
-				$handle = fopen($logClass::getLogFilePath(), 'rb');
-				if ($handle) {
-					return new LogIterator($handle, $dateFormat, $timezone);
-				} else {
-					throw new \Exception("Error while opening " . $logClass::getLogFilePath());
-				}
+		$log = $this->logFactory->get('file');
+		if($log instanceof IFileBased) {
+			$handle = fopen($log->getLogFilePath(), 'rb');
+			if ($handle) {
+				return new LogIterator($handle, $dateFormat, $timezone);
+			} else {
+				throw new \Exception("Error while opening " . $log->getLogFilePath());
 			}
 		}
 		throw new \Exception('Can\'t find log class');