From 29229d0641a28fe1ec8bce7414b3cc5d6a6b373e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20=C5=9Aliwka?= Date: Sun, 2 Sep 2018 11:58:16 +0200 Subject: [PATCH] Use json args inlining instead of WANT_JSON This improves performance by limiting amount of `scp` calls needed to run each task. --- src/ansible.lua | 4 +++- src/ansible_test.lua | 1 - src/copy.lua | 1 - src/file.lua | 1 - src/lineinfile.lua | 1 - src/opkg.lua | 1 - src/slurp.lua | 1 - src/stat.lua | 1 - src/ubus.lua | 1 - src/uci.lua | 1 - 10 files changed, 3 insertions(+), 10 deletions(-) diff --git a/src/ansible.lua b/src/ansible.lua index f3b6050..0c605f7 100644 --- a/src/ansible.lua +++ b/src/ansible.lua @@ -6,6 +6,8 @@ local ubus = require("ubus") Ansible.__index = Ansible +local json_arguments = [===[<>]===] + function Ansible.new(spec) local self = setmetatable({}, Ansible) self.spec = spec @@ -244,7 +246,7 @@ local function check_transform_type(variable, ansibletype) end function Ansible:parse(inputfile) - local params, pos, err = json.decode(self:slurp(inputfile)) + local params, pos, err = json.decode(json_arguments) if err then self:fail_json({msg="INTERNAL: Illegal json input received"}) diff --git a/src/ansible_test.lua b/src/ansible_test.lua index 4be0860..ba36a28 100644 --- a/src/ansible_test.lua +++ b/src/ansible_test.lua @@ -1,5 +1,4 @@ #!/usr/bin/env lua --- WANT_JSON local Ansible = require("ansible") diff --git a/src/copy.lua b/src/copy.lua index 33d651d..4eda07f 100644 --- a/src/copy.lua +++ b/src/copy.lua @@ -1,5 +1,4 @@ #!/usr/bin/lua --- WANT_JSON local Ansible = require("ansible") local File = require("fileutils") diff --git a/src/file.lua b/src/file.lua index a83383d..ca52f05 100644 --- a/src/file.lua +++ b/src/file.lua @@ -1,5 +1,4 @@ #!/usr/bin/lua --- WANT_JSON local Ansible = require("ansible") local File = require("fileutils") diff --git a/src/lineinfile.lua b/src/lineinfile.lua index 02ba432..f852f09 100644 --- a/src/lineinfile.lua +++ b/src/lineinfile.lua @@ -1,5 +1,4 @@ #!/usr/bin/lua --- WANT_JSON local Ansible = require("ansible") local File = require("fileutils") diff --git a/src/opkg.lua b/src/opkg.lua index fd34ce3..7fa815c 100644 --- a/src/opkg.lua +++ b/src/opkg.lua @@ -1,5 +1,4 @@ #!/usr/bin/lua --- WANT_JSON local Ansible = require("ansible") diff --git a/src/slurp.lua b/src/slurp.lua index 3c9e1f1..a16a546 100644 --- a/src/slurp.lua +++ b/src/slurp.lua @@ -1,5 +1,4 @@ #!/usr/bin/lua --- WANT_JSON local Ansible = require("ansible") local base64 = require("base64") diff --git a/src/stat.lua b/src/stat.lua index 51f4cf1..a32b18d 100644 --- a/src/stat.lua +++ b/src/stat.lua @@ -1,5 +1,4 @@ #!/usr/bin/lua --- WANT_JSON local Ansible = require("ansible") local File = require("fileutils") diff --git a/src/ubus.lua b/src/ubus.lua index 9da8cf8..4c02c40 100644 --- a/src/ubus.lua +++ b/src/ubus.lua @@ -1,5 +1,4 @@ #!/usr/bin/lua --- WANT_JSON local Ansible = require("ansible") local ubus = require("ubus") diff --git a/src/uci.lua b/src/uci.lua index 96121bd..88a7129 100644 --- a/src/uci.lua +++ b/src/uci.lua @@ -1,5 +1,4 @@ #!/usr/bin/lua --- WANT_JSON local Ansible = require("ansible") local ubus = require("ubus")