From cdfc85fde9c0bc5ef37838cf3b74d0f1b38e282d Mon Sep 17 00:00:00 2001 From: Ad Schellevis Date: Sun, 21 Aug 2016 20:07:39 +0200 Subject: [PATCH] (model) skip save on migration when defaults lead to inconsistent data, closes https://github.com/opnsense/core/issues/1149 --- src/opnsense/mvc/app/models/OPNsense/Base/BaseModel.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/opnsense/mvc/app/models/OPNsense/Base/BaseModel.php b/src/opnsense/mvc/app/models/OPNsense/Base/BaseModel.php index eff1ea68b..1292c3438 100644 --- a/src/opnsense/mvc/app/models/OPNsense/Base/BaseModel.php +++ b/src/opnsense/mvc/app/models/OPNsense/Base/BaseModel.php @@ -559,7 +559,11 @@ abstract class BaseModel // serialize to config after last migration step, keep the config data static as long as not all // migrations have completed. if ($upgradePerfomed) { - $this->serializeToConfig(); + try { + $this->serializeToConfig(); + } catch (\Exception $e) { + $logger->error("Model ".$class_info->getName() ." can't be saved, skip ( " .$e . " )"); + } } } }