separate image combine logic
This commit is contained in:
+18
-12
@@ -12,7 +12,10 @@ ngx.req.read_body()
|
||||
local req_body = cjson.decode(ngx.req.get_body_data())
|
||||
ngx.log(ngx.INFO, 'REQ_BODY -> ', ngx.req.get_body_data())
|
||||
local data = req_body["payload"]["images"]
|
||||
local combined = file_dir .. "/" .. uuid.generate_v4() .. ".jpeg";
|
||||
|
||||
let combined_uuid = uuid.generate_v4()
|
||||
local combined = file_dir .. "/" .. combined_uuid .. ".jpeg";
|
||||
|
||||
local len = table.getn(data)
|
||||
if len == 0 then
|
||||
ngx.status = 500
|
||||
@@ -35,16 +38,19 @@ end
|
||||
|
||||
local cmd = convert .. " -append " .. table.concat(origin, " ") .. " " .. combined
|
||||
ngx.log(ngx.INFO, 'CMD -> ', cmd)
|
||||
local result, _, code = os.execute(cmd)
|
||||
if result and code == 0 then
|
||||
io.popen(cmd)
|
||||
|
||||
ngx.log(ngx.INFO, "IMAGE COMBINED -> ", combined)
|
||||
ngx.say(combined_uuid)
|
||||
|
||||
ngx.log(ngx.INFO, "Upload combined image " .. combined .. " to upyun .")
|
||||
|
||||
upyun_upload.upload(combined)
|
||||
|
||||
else
|
||||
ngx.status = 500
|
||||
ngx.log(ngx.ERR, "IMAGE COMBINE *FAILED*")
|
||||
end
|
||||
-- local result, _, code = os.execute(cmd)
|
||||
--
|
||||
-- if result and code == 0 then
|
||||
-- ngx.log(ngx.INFO, "IMAGE COMBINED -> ", combined)
|
||||
--
|
||||
-- ngx.log(ngx.INFO, "Upload combined image " .. combined .. " to upyun .")
|
||||
--
|
||||
-- upyun_upload.upload(combined)
|
||||
-- else
|
||||
-- ngx.status = 500
|
||||
-- ngx.log(ngx.ERR, "IMAGE COMBINE *FAILED*")
|
||||
-- end
|
||||
|
||||
Reference in New Issue
Block a user