small fixes

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>

lib/Command/PointList.php

@@ -35,6 +35,7 @@
 use ArtificialOwl\MySmallPhpTools\Exceptions\SignatureException;
 use ArtificialOwl\MySmallPhpTools\Traits\TStringTools;
 use OC\Core\Command\Base;
+use OCA\Backup\Model\RemoteInstance;
 use OCA\Backup\Model\RestoringData;
 use OCA\Backup\Model\RestoringHealth;
 use OCA\Backup\Model\RestoringPoint;
@@ -171,7 +172,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
 						($fresh) ? $point->getParent() : '',
 						$comment,
 						implode(',', $status),
-						$instance,
+						($instance === RemoteInstance::LOCAL) ? '<info>' . $instance . '</info>' : $instance,
 						$this->displayStyleHealth($point),
 						'<error>' . $issue . '</error>'
 					]

lib/Cron/Backup.php

@@ -36,6 +36,7 @@
 use OCA\Backup\Service\ConfigService;
 use OCA\Backup\Service\CronService;
 use OCA\Backup\Service\PointService;
+use Psr\Log\LoggerInterface;
 use Throwable;
 
 /**
@@ -56,31 +57,36 @@ class Backup extends TimedJob {
 	/** @var ConfigService */
 	private $configService;
 
+	/** @var LoggerInterface */
+	private $loggerInterface;
 
 	/**
 	 * Backup constructor.
 	 *
 	 * @param PointService $pointService
 	 * @param CronService $cronService
 	 * @param ConfigService $configService
+	 * @param LoggerInterface $loggerInterface
 	 */
 	public function __construct(
 		PointService $pointService,
 		CronService $cronService,
-		ConfigService $configService
+		ConfigService $configService,
+		LoggerInterface $loggerInterface
 	) {
 		$this->setInterval(900);
 
 		$this->pointService = $pointService;
 		$this->cronService = $cronService;
 		$this->configService = $configService;
+		$this->loggerInterface = $loggerInterface;
 	}
 
 
 	/**
 	 * @param $argument
 	 */
-	protected function run($argument):void {
+	protected function run($argument): void {
 		if (!$this->cronService->isRealCron()) {
 			return;
 		}
@@ -115,6 +121,7 @@ private function runFullBackup(): void {
 		try {
 			$this->pointService->create(true);
 		} catch (Throwable $e) {
+			$this->loggerInterface->debug('error while running full backup - ' . json_encode(debug_backtrace()));
 		}
 	}
 
@@ -126,6 +133,7 @@ private function runDifferentialBackup(): void {
 		try {
 			$this->pointService->create(false);
 		} catch (Throwable $e) {
+			$this->loggerInterface->error('error while running differential backup - ' . json_encode(debug_backtrace()));
 		}
 	}
 }

lib/Cron/Manage.php

@@ -49,6 +49,8 @@
 class Manage extends TimedJob {
 
 
+	const DELAY_CHECK_HEALTH = 86400 * 7; // 7d
+
 	/** @var CronService */
 	private $cronService;
 
@@ -141,7 +143,7 @@ protected function run($argument) {
 		// regenerate local health
 		foreach ($this->pointService->getLocalRestoringPoints() as $point) {
 			if ($point->hasHealth()
-				&& $point->getHealth()->getChecked() > time() - 3600 * 12) {
+				&& $point->getHealth()->getChecked() > time() - self::DELAY_CHECK_HEALTH) {
 				continue;
 			}
 			try {

lib/Service/FilesService.php

@@ -107,7 +107,7 @@ public function fillRestoringData(RestoringData $data, string $path): void {
 		if (!is_dir($data->getAbsolutePath() . rtrim($path, '/'))) {
 			if ($data->getType() === RestoringData::ROOT_DATA
 				&& !$this->configService->getAppValueBool(ConfigService::INCLUDE_LOGS)
-				&& $path === 'nextcloud.log') {
+				&& substr($path, 0, 13) === 'nextcloud.log') {
 				return;
 			}