From a02cfd090d5b6fba0b644dcff59b8f3fc42a9d71 Mon Sep 17 00:00:00 2001
From: moicen <moicen@foxmail.com>
Date: Sun, 12 Sep 2021 11:29:30 +0800
Subject: [PATCH] add logic to handle image magick in linux

---
 prod/upload/combine.lua | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/prod/upload/combine.lua b/prod/upload/combine.lua
index 3d82946..4fb4971 100644
--- a/prod/upload/combine.lua
+++ b/prod/upload/combine.lua
@@ -15,11 +15,15 @@ for i = 1, len do
 end
 -- 从 nginx 变量取
 local magick = ngx.var.magick
+local convert = ngx.var.convert
 
 if not magick then
-    ngx.status = 500
-    ngx.say("image magick not found.")
-    return
+    if not convert then
+        ngx.status = 500
+        ngx.say("image magick not found.")
+        return
+    end
+    magick = ""
 end
 
 local result, _, code = os.execute(magick .. " convert -append " .. table.concat(origin, " ") .. " " .. combined)