Merge branch 'release/1.0.0.1'

Author: Pavel Perehozhih

pk-engine/pk-engine/webservice/client_api/url_handler_wrapper.lua

@@ -59,7 +59,7 @@ do
       response_fn,
       error_formatter_fn
     )
-    local err, msg = call(
+    local err, msg, code = call(
         error_formatter_fn,
         tostring(err_info) or "(error message is not a string)",
         api_context
@@ -73,7 +73,7 @@ do
       log_error(message)
       error(message)
     end
-    return call(response_fn, err, msg)
+    return call(response_fn, err, msg, code)
   end
 
   -- static --------------------------------------------------------------------
@@ -129,6 +129,7 @@ do
 
       local input, err = call(input_loader, api_context)
       if not input then
+        log_error("failed on url:", api_context:request_path_info())
         return respond_and_clean_context(api_context, err, response_fn, error_formatter_fn)
       end
 
@@ -192,6 +193,7 @@ do
 
       local input, err = call(input_loader, api_context)
       if not input then
+        log_error("failed on url:", api_context:request_path_info())
         return respond_and_clean_context(api_context, err, response_fn, error_formatter_fn)
       end
 
@@ -284,6 +286,7 @@ do
 
       local input, err = call(input_loader, api_context)
       if not input then
+        log_error("failed on url:", api_context:request_path_info())
         return respond_and_clean_context(
             api_context,
             err,

pk-engine/pk-engine/webservice/response.lua

@@ -42,15 +42,15 @@ local common_html_error = function(error_id)
       "string", error_id
     )
 
-  return '<H1>Error!</H1>' .. error_id -- TODO: Cache results?
+  return '<H1>Error!</H1>' .. error_id, {}, 500 -- TODO: Cache results?
 end
 
 local common_text_error = function(error_id)
   arguments(
       "string", error_id
     )
 
-  return 'Error!\n\n' .. error_id -- TODO: Cache results?
+  return 'Error!\n\n' .. error_id, {}, 500 -- TODO: Cache results?
 end
 
 -- Note that error_id is intentionally not escaped.
@@ -60,7 +60,7 @@ local common_xml_error = function(error_id)
       "string", error_id
     )
 
-  return '<error id="' .. error_id .. '"/>' -- TODO: Cache results?
+  return '<error id="' .. error_id .. '"/>', {}, 500 -- TODO: Cache results?
 end
 
 -- Note that error_id is intentionally not escaped.
@@ -70,7 +70,7 @@ local common_json_error = function(error_id)
       "string", error_id
     )
 
-  return '{ "error" : { "id" : "' .. error_id .. '" } }' -- TODO: Cache results?
+  return '{ "error" : { "id" : "' .. error_id .. '" } }', {}, 500 -- TODO: Cache results?
 end
 
 local common_luabins_error = function(error_id)