From f59ca19ff34e32c1c4e806523c2a2ec9b83a6d53 Mon Sep 17 00:00:00 2001
From: Axel Kittenberger <axkibe@gmail.com>
Date: Thu, 11 Nov 2010 09:36:56 +0000
Subject: [PATCH]

---
 lsyncd-conf.lua | 27 ++++++++------------------
 lsyncd.lua      | 50 +++++++++++++++++++++++++++++++++++--------------
 2 files changed, 44 insertions(+), 33 deletions(-)

diff --git a/lsyncd-conf.lua b/lsyncd-conf.lua
index 79590d0..37c6362 100644
--- a/lsyncd-conf.lua
+++ b/lsyncd-conf.lua
@@ -17,23 +17,12 @@ prefix = "sleep 1 && "
 slowbash = {
 	delay = 5,
 
-	init = function(inlet)
-		local c = inlet.getConfig()
-		log("Normal", "cp -r from ", c.source, " -> ", c.target)
-
-		-- collect gets called when spawned process finished
-		local function collect(event, exitcode)
-			if exitcode == 0 then
-				log("Normal", "Startup of '",c.source,"' finished.")
-			else
-				log("Error", "Failure on startup of '",c.source,"'.")
-				terminate(-1) -- ERRNO
-			end
-		end
-
-		spawnShell(inlet.createBlanketEvent(), collect,
+	onStartup = function(event)
+		local config = event.config
+		log("Normal", "cp -r from ", config.source, " -> ", config.target)
+		spawnShell(event,
 			[[if [ "$(ls -A $1)" ]; then cp -r "$1"* "$2"; fi]], 
-			c.source, c.target)
+			config.source, config.target)
 	end,
 
 	onCreate = function(event)
@@ -56,9 +45,9 @@ slowbash = {
 		spawnShell(event, "ok", prefix..[[rm -rf "$1"]], t)
 	end,
 
-	onMove = function(event, eventd)
-		local t = event.targetPathname
-		local d = eventd.targetPathname
+	onMove = function(originEvent, destinationEvent)
+		local t = originEvent.targetPathname
+		local d = destinationEvent.targetPathname
 		log("Normal", "Spawning Move from ",t," to ",d)
 		spawnShell(event, "ok", prefix..[[mv "$1" "$2"]], t, d)
 	end,
diff --git a/lsyncd.lua b/lsyncd.lua
index ab03341..154bb19 100644
--- a/lsyncd.lua
+++ b/lsyncd.lua
@@ -495,17 +495,10 @@ local Sync = (function()
 		if delay.status ~= "active" then
 			error("internal fail, collecting a non-active process")
 		end
-		if delay.collector then
-			local cr
-			if type(delay.collector) == "function" then
-				InletControl.setSync(self)
-				cr = delay.collector(InletControl.toEvent(delay), exitcode)
-			else
-				cr = delay.collector
-			end
-		end
-		-- TODO honor return codes of the collector
+		InletControl.setSync(self)
 
+		local rc = self.config.collector(InletControl.toEvent(delay), exitcode)
+		-- TODO honor return codes of the collector
 		-- Remove the delay.
 		local found
 		for i, d in ipairs(self.delays) do
@@ -1363,12 +1356,11 @@ end
 -- @param binary  binary to call
 -- @param ...     arguments
 --
-function spawn(agent, collector, binary, ...)
+function spawn(agent, binary, ...)
 	local pid = lsyncd.exec(binary, ...)
 	if pid and pid > 0 then
 		local sync, delay = InletControl.getInterior(agent)
 		delay.status = "active"
-		delay.collector = collector
 		sync.processes[pid] = delay
 	end
 end
@@ -1376,8 +1368,8 @@ end
 -----
 -- Spawns a child process using bash.
 --
-function spawnShell(agent, collector, command, ...)
-	return spawn(agent, collector, "/bin/sh", "-c", command, "/bin/sh", ...)
+function spawnShell(agent, command, ...)
+	return spawn(agent, "/bin/sh", "-c", command, "/bin/sh", ...)
 end
 
 
@@ -1483,6 +1475,36 @@ default = {
 		Delete = { Attrib = 1, Modify = 1, Create = 3, Delete = 1 },
 	},
 
+	-----
+	-- Called when collecting a finished child process
+	--
+	collect = function(event, exitcode)
+		if event.etype == "Blanket" then
+			if exitcode == 0 then
+				log("Normal", "Startup of '",c.source,"' finished.")
+			else
+				log("Error", "Failure on startup of '",c.source,"'.")
+				terminate(-1) -- ERRNO
+			end
+			return
+		end
+		log("Normal", "Finished ",event.atype,
+			" on ",event.sourcename," = ",exitcode)
+	end,
+
+	-----
+	-- called on (re)initalizing of lsyncd.
+	--
+	init = function(inlet)
+		local config = inlet.getConfig()
+		
+		-- creates a prior startup if configured
+		if type(config.onStartup) == "function" then
+			local event = inlet.createBlanketEvent()
+			config.onStartup(event)
+		end
+	end,
+
 	-----
 	-- TODO
 	--