diff --git a/ProjectTemplate/include/Header.asp b/ProjectTemplate/include/Header.asp index c5f2ef9..a5f9cc1 100644 --- a/ProjectTemplate/include/Header.asp +++ b/ProjectTemplate/include/Header.asp @@ -21,7 +21,7 @@ - + diff --git a/include/ajax_crud.asp b/include/ajax_crud.asp index 3e596bc..92c6b46 100644 --- a/include/ajax_crud.asp +++ b/include/ajax_crud.asp @@ -109,8 +109,18 @@ END IF '-- 20251029 박준성 당분간 모든 요청에 대해서 서버에 로그를 쌓기' + On Error Resume Next + + Err.Clear CALL INSERT_REQUEST_LOG(IsReject) + If Err.Number <> 0 Then + Response.AppendToLog " LogInsertError=" & CStr(Err.Number) + Err.Clear + End If + + On Error GoTo 0 + If IsReject = "1" Then Response.Status = "401 Unauthorized" Response.AddHeader "Cache-Control", "no-store" diff --git a/module/survey.js b/module/survey.js index 7901275..c431ae7 100644 --- a/module/survey.js +++ b/module/survey.js @@ -134,16 +134,25 @@ kon.survey = (function () { }) } - function submitNextPage(form, waits) { + function submitNextPage(form, waits) { + + // undefined 또는 잘못된 Promise 제거 + waits = waits.filter(function (wait) { + return wait && typeof wait.always === "function"; + }); + var remaining = waits.length; + if (remaining === 0) { form.attr("onsubmit", ""); form.submit(); return; } + waits.forEach(function (wait) { wait.always(function () { remaining--; + if (remaining === 0) { form.attr("onsubmit", ""); form.submit(); @@ -192,38 +201,43 @@ kon.survey = (function () { } function callKartDerived(pkey, idkey) { - var url = KART_BASE_URL - + "/project/" + KART_PROJECT_TYPE - + "/" + encodeURIComponent(pkey) - + "/derived/respondent/" + encodeURIComponent(idkey) - + "/recalculate"; + try{ + var url = KART_BASE_URL + + "/project/" + KART_PROJECT_TYPE + + "/" + encodeURIComponent(pkey) + + "/derived/respondent/" + encodeURIComponent(idkey) + + "/recalculate"; - logExternalApi("DERIVED", idkey, "", "REQUEST", ""); + logExternalApi("DERIVED", idkey, "", "REQUEST", ""); - return $.ajax({ - url: url, - type: "POST", - headers: { - "X-API-Key": KON_KIWI_API_KEY - }, - dataType: "json", - cache: false, - timeout: 60000, + return $.ajax({ + url: url, + type: "POST", + headers: { + "X-API-Key": KON_KIWI_API_KEY + }, + dataType: "json", + cache: false, + timeout: 60000, - success: function (data, status, xhr) { - logExternalApi( - "DERIVED", idkey, "", "SUCCESS", - "HTTP " + xhr.status - ); - }, + success: function (data, status, xhr) { + logExternalApi( + "DERIVED", idkey, "", "SUCCESS", + "HTTP " + xhr.status + ); + }, - error: function (xhr, status) { - logExternalApi( - "DERIVED", idkey, "", "FAIL", - "HTTP " + xhr.status + " / " + status - ); - } - }); + error: function (xhr, status) { + logExternalApi( + "DERIVED", idkey, "", "FAIL", + "HTTP " + xhr.status + " / " + status + ); + } + }); + } + catch(ex){ + return $.Deferred().resolve().promise(); + } } function callContactStatusApi(contactMappingList, idkey, statuses) {