Merge pull request #1741 from Icinga/import-error-handling

Import: Improve exception info during storing rows
Icinga · Dec 14, 2018 · 79482bb · 79482bb
2 parents 3531839 + 58c0689
commit 79482bb
Showing 1 changed file with 14 additions and 6 deletions.
diff --git a/library/Director/Import/Import.php b/library/Director/Import/Import.php
@@ -301,12 +301,20 @@ protected function storeRowset()
             }
 
             foreach ($newRows as $row) {
-                $db->insert('imported_row', $rows[$row]);
-                foreach ($this->rowProperties[$row] as $property) {
-                    $db->insert('imported_row_property', array(
-                        'row_checksum'      => $this->quoteBinary($row),
-                        'property_checksum' => $property
-                    ));
+                try {
+                    $db->insert('imported_row', $rows[$row]);
+                    foreach ($this->rowProperties[$row] as $property) {
+                        $db->insert('imported_row_property', array(
+                            'row_checksum'      => $this->quoteBinary($row),
+                            'property_checksum' => $property
+                        ));
+                    }
+                } catch (Exception $e) {
+                    throw new IcingaException(
+                        "Error while storing a row for '%s' into database: %s",
+                        $rows[$row]['object_name'],
+                        $e->getMessage()
+                    );
                 }
             }