Ensure hotdeploying

diff --git a/libs/web/luasrc/dispatcher.lua b/libs/web/luasrc/dispatcher.lua
index 8d79d7e8abb57f905c53493a3411971544905b91..79532ddf1d1da1f5d1eef2ea863b6d74a72e6266 100644 (file)
--- a/libs/web/luasrc/dispatcher.lua
+++ b/libs/web/luasrc/dispatcher.lua
@@ -300,28 +300,35 @@ end
 -- @param path         Controller base directory
 -- @param suffix       Controller file suffix
 function createindex_plain(path, suffix)
+       local controllers = util.combine(
+               luci.fs.glob(path .. "*" .. suffix) or {},
+               luci.fs.glob(path .. "*/*" .. suffix) or {}
+       )
+
        if indexcache then
                local cachedate = fs.mtime(indexcache)
-               if cachedate and cachedate > fs.mtime(path) then
+               if cachedate then
+                       local realdate = 0
+                       for _, obj in ipairs(controllers) do
+                               local omtime = fs.mtime(path .. "/" .. obj)
+                               realdate = (omtime and omtime > realdate) and omtime or realdate
+                       end
 
-                       assert(
-                               sys.process.info("uid") == fs.stat(indexcache, "uid")
-                               and fs.stat(indexcache, "mode") == "rw-------",
-                               "Fatal: Indexcache is not sane!"
-                       )
+                       if cachedate > realdate then
+                               assert(
+                                       sys.process.info("uid") == fs.stat(indexcache, "uid")
+                                       and fs.stat(indexcache, "mode") == "rw-------",
+                                       "Fatal: Indexcache is not sane!"
+                               )
 
-                       index = loadfile(indexcache)()
-                       return index
+                               index = loadfile(indexcache)()
+                               return index
+                       end
                end
        end
 
        index = {}
 
-       local controllers = util.combine(
-               luci.fs.glob(path .. "*" .. suffix) or {},
-               luci.fs.glob(path .. "*/*" .. suffix) or {}
-       )
-
        for i,c in ipairs(controllers) do
                local module = "luci.controller." .. c:sub(#path+1, #c-#suffix):gsub("/", ".")
                local mod = require(module)