octoleo/lsyncd
1
0
Fork 0
mirror of https://github.com/octoleo/lsyncd.git synced 2024-12-14 06:58:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

working on it

Browse Source
This commit is contained in:
Axel Kittenberger 2010-11-20 13:22:47 +00:00
parent ec336e0ed1
commit c3b15c2aef
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lsyncd.c
View File

@ -600,6 +600,10 @@ l_log(lua_State *L)
} }
lua_replace(L, i); lua_replace(L, i);
break; break;
case LUA_TNIL:
lua_pushstring(L, "(nil)");
lua_replace(L, i);
break;
} }
} }
} }
@ -993,6 +997,7 @@ l_configure(lua_State *L)
if (!settings.log_file) { if (!settings.log_file) {
settings.log_syslog = true; settings.log_syslog = true;
} }
logstring("Debug", "daemonizing now.");
if (daemon(0, 0)) { if (daemon(0, 0)) {
logstring("Error", "Failed to daemonize"); logstring("Error", "Failed to daemonize");
exit(-1); //ERRNO exit(-1); //ERRNO
@ -1213,7 +1218,7 @@ handle_event(lua_State *L,
lua_pushnil(L); lua_pushnil(L);
lua_pushnil(L); lua_pushnil(L);
} }
if (lua_pcall(L, 7, 0, -8)) { if (lua_pcall(L, 7, 0, -9)) {
exit(-1); // ERRNO exit(-1); // ERRNO
} }
lua_pop(L, 1); lua_pop(L, 1);
@ -1499,7 +1504,7 @@ main1(int argc, char *argv[])
logstring("Error", logstring("Error",
"Using a staticly included runner as default."); "Using a staticly included runner as default.");
#endif #endif
return -1; //ERRNO exit(-1); //ERRNO
} }
lsyncd_runner_file = argv[argp + 1]; lsyncd_runner_file = argv[argp + 1];
argp += 2; argp += 2;

7
lsyncd.lua
View File

@ -1442,7 +1442,7 @@ local Inotifies = (function()
-- The same vice versa, all watch descriptors by its -- The same vice versa, all watch descriptors by its
-- absolute path. -- absolute path.
-- --
local pathwds = CountArray.new() local pathwds = {}
----- -----
-- A list indexed by sync's containing the root path this -- A list indexed by sync's containing the root path this
@ -1461,7 +1461,8 @@ local Inotifies = (function()
-- --
local function addWatch(path, recurse, raiseSync, raiseTime) local function addWatch(path, recurse, raiseSync, raiseTime)
log("Function", log("Function",
"Inotifies.addWatch(",path,", ",recurse,", ",sync,", ",raise")") "Inotifies.addWatch(",path,", ",recurse,", ",
raiseSync,", ",raiseTime,")")
local wd = pathwds[path] local wd = pathwds[path]
if not wd then if not wd then
@ -1553,7 +1554,7 @@ local Inotifies = (function()
end end
-- looks up the watch descriptor id -- looks up the watch descriptor id
local path = wdlist[wd] local path = wdpaths[wd]
if not path then if not path then
-- this is normal in case of deleted subdirs -- this is normal in case of deleted subdirs
log("Inotify", "event belongs to unknown watch descriptor.") log("Inotify", "event belongs to unknown watch descriptor.")