diff --git a/default-rsyncssh.lua b/default-rsyncssh.lua index 1cd36b4..94b7eea 100644 --- a/default-rsyncssh.lua +++ b/default-rsyncssh.lua @@ -206,7 +206,7 @@ rsyncssh.collect = function( agent, exitcode ) if rc == 'ok' then log('Normal', 'Startup of "',agent.source,'" finished: ', exitcode) elseif rc == 'again' then - if settings.insist then + if uSettings.insist then log('Normal', 'Retrying startup of "',agent.source,'": ', exitcode) else log('Error', 'Temporary or permanent failure on startup of "', diff --git a/lsyncd.lua b/lsyncd.lua index 884dd67..70d9ef3 100644 --- a/lsyncd.lua +++ b/lsyncd.lua @@ -3386,6 +3386,11 @@ local lsyncdStatus = 'init' -- local runner = { } +-- +-- Last time said to be waiting for more child processes +-- +local lastReportedWaiting = false + -- -- Called from core whenever Lua code failed. -- @@ -3452,12 +3457,19 @@ function runner.cycle( if processCount > 0 then - log( - 'Normal', - 'waiting for ', - processCount, - ' more child processes.' - ) + if + lastReportedWaiting == false or + timestamp >= lastReportedWaiting + 60 + then + lastReportedWaiting = timestamp + + log( + 'Normal', + 'waiting for ', + processCount, + ' more child processes.' + ) + end return true else @@ -3467,7 +3479,6 @@ function runner.cycle( end if lsyncdStatus ~= 'run' then - error( 'runner.cycle() called while not running!' ) end @@ -3804,6 +3815,8 @@ function runner.initialize( firstTime ) end + lastReportedWaiting = false + -- -- From this point on, no globals may be created anymore --