diff --git a/cp_scripts_local_macos.sh b/cp_scripts_local_macos.sh index 87ff731..0340a65 100755 --- a/cp_scripts_local_macos.sh +++ b/cp_scripts_local_macos.sh @@ -28,10 +28,7 @@ cp test_scripts/*.lua $openresty_lua_scripts_dir/tests/ # -- Replace scripts path in file sed -i -e "s||$openresty_lua_scripts_dir|" \ - "$openresty_lua_scripts_dir"/combine.lua \ - "$openresty_lua_scripts_dir"/convert_audio.lua \ - "$openresty_lua_scripts_dir"/test_upyun_upload.lua \ - "$openresty_lua_scripts_dir"/upyun_upload.lua + "$openresty_lua_scripts_dir"/*.lua # Reload openresty openresty -t diff --git a/scripts/check_file.lua b/scripts/check_file.lua index 112a84f..5082b53 100644 --- a/scripts/check_file.lua +++ b/scripts/check_file.lua @@ -9,8 +9,7 @@ end local file_to_check = string.match(ngx.var.request_uri, ".*/(.*)") local file_dir = ngx.var.tmp_file_dir - local fullpath = file_dir .. "/" .. file_to_check .. ".jpeg"; - +ngx.log(ngx.INFO, "FILE TO CHECK -> ", fullpath) ngx.say(file_exists(fullpath)) diff --git a/scripts/combine.lua b/scripts/combine.lua index 2a7d40a..5746294 100644 --- a/scripts/combine.lua +++ b/scripts/combine.lua @@ -13,7 +13,7 @@ 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"] -let combined_uuid = uuid.generate_v4() +local combined_uuid = uuid.generate_v4() local combined = file_dir .. "/" .. combined_uuid .. ".jpeg"; local len = table.getn(data) diff --git a/scripts/upload_combined_image.lua b/scripts/upload_combined_image.lua index 1cddb86..1671408 100644 --- a/scripts/upload_combined_image.lua +++ b/scripts/upload_combined_image.lua @@ -6,4 +6,7 @@ local file_to_upload = string.match(ngx.var.request_uri, ".*/(.*)") local file_dir = ngx.var.tmp_file_dir local fullpath = file_dir .. "/" .. file_to_upload .. ".jpeg"; +ngx.log(ngx.INFO, 'UPLOAD COMBINED IMAGE -> ', fullpath) + + upyun_upload.upload(fullpath) \ No newline at end of file