lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-20 03:16:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

MVC / config: synchronize backup timestamps with revisions.

Browse Source 
A minor change, previously we requested microtime() twice which always lead to a small difference in revision and backup. If we sync these two timestamps, it's easier to find the previous sitation updated.time matches /conf/backup/config-[updated.time].xml
This commit is contained in:
Ad Schellevis 2020-03-09 15:16:22 +01:00
parent 211fd8dfb3
commit 01fb3a4f44
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/opnsense/mvc/app/library/OPNsense/Core/Config.php
View File

@ -406,7 +406,7 @@ class Config extends Singleton
* @param array|null $revision revision tag (associative array)
* @param \SimpleXMLElement|null pass trough xml node
*/
private function updateRevision($revision, $node = null)
private function updateRevision($revision, $node = null, $timestamp = null)
{
// if revision info is not provided, create a default.
if (!is_array($revision)) {
@ -430,7 +430,7 @@ class Config extends Singleton
}
// always set timestamp
$revision['time'] = microtime(true);
$revision['time'] = empty($timestamp) ? microtime(true) : $timestamp;
if ($node == null) {
if (isset($this->simplexml->revision)) {
@ -456,11 +456,13 @@ class Config extends Singleton
/**
* backup current (running) config
* @return float timestamp
*/
public function backup()
{
$timestamp = microtime(true);
$target_dir = dirname($this->config_file) . "/backup/";
$target_filename = "config-" . microtime(true) . ".xml";
$target_filename = "config-" . $timestamp . ".xml";
if (!file_exists($target_dir)) {
// create backup directory if it is missing
@ -471,6 +473,7 @@ class Config extends Singleton
if (!file_exists($target_dir . $target_filename)) {
copy($this->config_file, $target_dir . $target_filename);
}
return $timestamp;
}
/**
@ -575,11 +578,13 @@ class Config extends Singleton
$this->checkvalid();
if ($backup) {
$this->backup();
$timestamp = $this->backup();
} else {
$timestamp = microtime(true);
}
// update revision information ROOT.revision tag
$this->updateRevision($revision);
// update revision information ROOT.revision tag, align timestamp to backup output
$this->updateRevision($revision, null, $timestamp);
// serialize to text
$xml_text = $this->__toString();