Author:   Lars Michelsen <[email protected]>
Date:     Thu May 24 19:58:29 2012 +0200
Committer:   Lars Michelsen <[email protected]>
Commit-Date: Thu May 24 19:58:29 2012 +0200

Checking conf.d directory modification time to detect removed config
files to be able to delete the config cache in this case

---

 ChangeLog                                   |    6 ++++++
 TODO                                        |    1 +
 share/server/core/classes/GlobalMainCfg.php |    3 ++-
 3 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 890f761..9089306 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+1.7b2
+Core
+  * Checking conf.d directory modification time to detect removed config files
+    to be able to delete the config cache in this case
+
+
 1.7b1
 Core
   * Introducing the "map source" feature. Take a look at the docs for details
diff --git a/TODO b/TODO
index 4075b34..8308dc9 100644
--- a/TODO
+++ b/TODO
@@ -4,6 +4,7 @@ This is a small file for storing quick thoughts about new 
features and needed ch
 Probleme:
   - Warnings anzeigen, wenn Funktionen aus oldPhpVersionFixes.php angezogen 
werden
   - Sidebar auf/zu verschiebt Objekte, aber nicht den Hintergrund
+  - Bug: Wenn eine Konfigurationsdatei gelöscht wird, wird der maincfg cache 
nicht erneuert
 
 Zu tun:
   - Automap zu source umbauen
diff --git a/share/server/core/classes/GlobalMainCfg.php 
b/share/server/core/classes/GlobalMainCfg.php
index 4693ad9..124e965 100644
--- a/share/server/core/classes/GlobalMainCfg.php
+++ b/share/server/core/classes/GlobalMainCfg.php
@@ -1128,7 +1128,8 @@ class GlobalMainCfg {
                                              
CONST_MAINCFG_CACHE.'-pre-user-'.CONST_VERSION.'-cache'.$cacheSuffix);
 
        if($this->CACHE->isCached(false) === -1
-           || $this->PUCACHE->isCached(false) === -1) {
+           || $this->PUCACHE->isCached(false) === -1
+           || $this->PUCACHE->getCacheFileAge() < 
filemtime(CONST_MAINCFG_DIR)) {
             // The cache is too old. Load all config files
             foreach($this->configFiles AS $configFile) {
                 // Only proceed when the configuration file exists and is 
readable


------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Nagvis-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/nagvis-checkins

Reply via email to