fix: Print error during commands and catch more general errors during…

… migration Signed-off-by: Julius Härtl <jus@bitgrid.net>
nextcloud · Jan 24, 2024 · 25d220e · 25d220e
1 parent 4a94719
commit 25d220e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/lib/Command/TransferLegacyRows.php b/lib/Command/TransferLegacyRows.php
@@ -138,7 +138,7 @@ private function transferDataForTables(array $tables, OutputInterface $output):
 				if ($output->isVerbose()) {
 					$output->writeln("❌ Error: " . $e->getMessage());
 				}
-				$output->writeln("⚠️  Could not transfer data. Continue with next table. The logs will have more information about the error.");
+				$output->writeln("⚠️  Could not transfer data. Continue with next table. The logs will have more information about the error: " . $e->getMessage());
 			}
 			$i++;
 		}

diff --git a/lib/Migration/NewDbStructureRepairStep.php b/lib/Migration/NewDbStructureRepairStep.php
@@ -14,6 +14,7 @@
 use OCP\Migration\IOutput;
 use OCP\Migration\IRepairStep;
 use Psr\Log\LoggerInterface;
+use Throwable;
 
 class NewDbStructureRepairStep implements IRepairStep {
 
@@ -72,7 +73,7 @@ private function transferDataForTables(array $tables, IOutput $output) {
 			$output->info("-- Start transfer for table " . $table->getId() . " (" . $table->getTitle() . ") [" . $i . "/" . count($tables) . "]");
 			try {
 				$this->transferTable($table, $output);
-			} catch (InternalError|PermissionError|Exception $e) {
+			} catch (InternalError|PermissionError|Exception|Throwable $e) {
 				$this->logger->error($e->getMessage(), ['exception' => $e]);
 				$output->warning("Could not transfer data. Continue with next table. The logs will have more information about the error: " . $e->getMessage());
 			}