diff mbox series

[10/11] Lua: update example Lua handler

Message ID 20171103123009.18705-10-christian.storm@siemens.com
State Accepted
Headers show
Series [01/11] Lua: expose get_tmpdir() to Lua | expand

Commit Message

Storm, Christian Nov. 3, 2017, 12:30 p.m. UTC
Update the example Lua handler to showcase the new Lua
handlers' features.

Signed-off-by: Christian Storm <christian.storm@siemens.com>
---
 handlers/lua/fpga.lua | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

Comments

Stefano Babic Nov. 7, 2017, 4:19 p.m. UTC | #1
On 03/11/2017 13:30, Christian Storm wrote:
> Update the example Lua handler to showcase the new Lua
> handlers' features.
> 
> Signed-off-by: Christian Storm <christian.storm@siemens.com>
> ---
>  handlers/lua/fpga.lua | 22 +++++++++++++---------
>  1 file changed, 13 insertions(+), 9 deletions(-)
> 
> diff --git a/handlers/lua/fpga.lua b/handlers/lua/fpga.lua
> index f5a1e55..164b3f4 100644
> --- a/handlers/lua/fpga.lua
> +++ b/handlers/lua/fpga.lua
> @@ -1,8 +1,8 @@
>  require ("swupdate")
>  
>  fpga_handler = function(image)
> -        print("Install FPGA Software ")
> -	swupdate.notify(swupdate.RECOVERY_STATUS.IDLE,0,"register lua handle")
> +	print("Install FPGA Software ")
> +	swupdate.notify(swupdate.RECOVERY_STATUS.IDLE, 0, "register Lua handler")
>  	print ("hello world!")
>  	print ("RECOVERY_STATUS.IDLE: ".. swupdate.RECOVERY_STATUS.IDLE)
>  	print ("RECOVERY_STATUS.START: ".. swupdate.RECOVERY_STATUS.START)
> @@ -10,13 +10,17 @@ fpga_handler = function(image)
>  	print ("RECOVERY_STATUS.SUCCESS: ".. swupdate.RECOVERY_STATUS.SUCCESS)
>  	print ("RECOVERY_STATUS.FAILURE: ".. swupdate.RECOVERY_STATUS.FAILURE)
>  
> +	for k,l in pairs(image) do
> +		print("image[" .. tostring(k) .. "] = " .. tostring(l))
> +		swupdate.notify(swupdate.RECOVERY_STATUS.RUN, 0, "image[" .. tostring(k) .. "] = " .. tostring(l))
> +	end
>  
> -        for k,l in pairs(image) do
> -                print("image[" .. tostring(k) .. "] = " .. tostring(l) )
> -                swupdate.notify(swupdate.RECOVERY_STATUS.RUN,0,"image[" .. tostring(k) .. "] = " .. tostring(l))
> -        end
> -
> -        return 0
> +	err, msg = image:read(function(data) print(data) end)
> +	if err ~= 0 then
> +		swupdate.error(string.format("Error reading image: %s", msg))
> +		return 1
> +	end
> +	return 0
>  end
>  
> -swupdate.register_handler("fpga",fpga_handler)
> +swupdate.register_handler("fpga", fpga_handler, swupdate.HANDLER_MASK.IMAGE_HANDLER)
> 

Applied to -master, thanks !

Best regards,
Stefano Babic
diff mbox series

Patch

diff --git a/handlers/lua/fpga.lua b/handlers/lua/fpga.lua
index f5a1e55..164b3f4 100644
--- a/handlers/lua/fpga.lua
+++ b/handlers/lua/fpga.lua
@@ -1,8 +1,8 @@ 
 require ("swupdate")
 
 fpga_handler = function(image)
-        print("Install FPGA Software ")
-	swupdate.notify(swupdate.RECOVERY_STATUS.IDLE,0,"register lua handle")
+	print("Install FPGA Software ")
+	swupdate.notify(swupdate.RECOVERY_STATUS.IDLE, 0, "register Lua handler")
 	print ("hello world!")
 	print ("RECOVERY_STATUS.IDLE: ".. swupdate.RECOVERY_STATUS.IDLE)
 	print ("RECOVERY_STATUS.START: ".. swupdate.RECOVERY_STATUS.START)
@@ -10,13 +10,17 @@  fpga_handler = function(image)
 	print ("RECOVERY_STATUS.SUCCESS: ".. swupdate.RECOVERY_STATUS.SUCCESS)
 	print ("RECOVERY_STATUS.FAILURE: ".. swupdate.RECOVERY_STATUS.FAILURE)
 
+	for k,l in pairs(image) do
+		print("image[" .. tostring(k) .. "] = " .. tostring(l))
+		swupdate.notify(swupdate.RECOVERY_STATUS.RUN, 0, "image[" .. tostring(k) .. "] = " .. tostring(l))
+	end
 
-        for k,l in pairs(image) do
-                print("image[" .. tostring(k) .. "] = " .. tostring(l) )
-                swupdate.notify(swupdate.RECOVERY_STATUS.RUN,0,"image[" .. tostring(k) .. "] = " .. tostring(l))
-        end
-
-        return 0
+	err, msg = image:read(function(data) print(data) end)
+	if err ~= 0 then
+		swupdate.error(string.format("Error reading image: %s", msg))
+		return 1
+	end
+	return 0
 end
 
-swupdate.register_handler("fpga",fpga_handler)
+swupdate.register_handler("fpga", fpga_handler, swupdate.HANDLER_MASK.IMAGE_HANDLER)