diff --git a/src/hm/HookAPI.cc b/src/hm/HookAPI.cc
index dad867f36d..432d62f51d 100644
--- a/src/hm/HookAPI.cc
+++ b/src/hm/HookAPI.cc
@@ -35,13 +35,15 @@ std::string * HookAPI::format_message(std::string method, ParamList& paramList,
for (int i = 0; i < paramList.size(); i++)
{
- oss << ""
- << paramList.get_value_as_string(i)
- << "";
+ oss << ""
+ << "" << i + 1 << ""
+ << "IN"
+ << "" << paramList.get_value_as_string(i) << ""
+ << "";
}
- oss << ""
- << att.retval_xml
+ oss << att.retval_xml
+ << ""
<< ""
<< "";
diff --git a/src/rm/Request.cc b/src/rm/Request.cc
index b93cd57fa5..f30d2f5e61 100644
--- a/src/rm/Request.cc
+++ b/src/rm/Request.cc
@@ -736,30 +736,36 @@ void Request::quota_rollback(Template * tmpl,
/* -------------------------------------------------------------------------- */
/* -------------------------------------------------------------------------- */
+template
+static void make_parameter(std::ostringstream& oss, int pos, const T& val)
+{
+ oss << ""
+ << "" << pos << ""
+ << "OUT"
+ << "" << val << ""
+ << "";
+}
+
void Request::failure_response(ErrorCode ec, const string& str_val,
RequestAttributes& att)
{
vector arrayData;
ostringstream oss;
- oss << "";
-
arrayData.push_back(xmlrpc_c::value_boolean(false));
- oss << "false";
+ make_parameter(oss, 1, "false");
arrayData.push_back(xmlrpc_c::value_string(str_val));
- oss << "" << one_util::escape_xml(str_val) << "";
+ make_parameter(oss, 2, one_util::escape_xml(str_val));
arrayData.push_back(xmlrpc_c::value_int(ec));
- oss << "" << ec << "";
+ make_parameter(oss, 3, ec);
arrayData.push_back(xmlrpc_c::value_int(att.resp_id));
- oss << "" << att.resp_id << "";
+ make_parameter(oss, 4, att.resp_id);
arrayData.push_back(xmlrpc_c::value_i8(att.replication_idx));
- oss << "";
-
xmlrpc_c::value_array arrayresult(arrayData);
*(att.retval) = arrayresult;
@@ -875,16 +881,14 @@ void Request::success_response(int id, RequestAttributes& att)
vector arrayData;
ostringstream oss;
- oss << "";
-
arrayData.push_back(xmlrpc_c::value_boolean(true));
- oss << "true";
- arrayData.push_back(xmlrpc_c::value_int(id));
- oss << "" << id << "";
- arrayData.push_back(xmlrpc_c::value_int(SUCCESS));
- oss << "" << SUCCESS << "";
+ make_parameter(oss, 1, "true");
- oss << "";
+ arrayData.push_back(xmlrpc_c::value_int(id));
+ make_parameter(oss, 2, id);
+
+ arrayData.push_back(xmlrpc_c::value_int(SUCCESS));
+ make_parameter(oss, 3, SUCCESS);
xmlrpc_c::value_array arrayresult(arrayData);
@@ -900,16 +904,14 @@ void Request::success_response(const string& val, RequestAttributes& att)
vector arrayData;
ostringstream oss;
- oss << "";
-
arrayData.push_back(xmlrpc_c::value_boolean(true));
- oss << "true";
- arrayData.push_back(static_cast(val));
- oss << "" << one_util::escape_xml(val.substr(0, 50)) << "";
- arrayData.push_back(xmlrpc_c::value_int(SUCCESS));
- oss << "" << SUCCESS << "";
+ make_parameter(oss, 1, "true");
- oss << "";
+ arrayData.push_back(static_cast(val));
+ make_parameter(oss, 2, one_util::escape_xml(val));
+
+ arrayData.push_back(xmlrpc_c::value_int(SUCCESS));
+ make_parameter(oss, 3, SUCCESS);
xmlrpc_c::value_array arrayresult(arrayData);
@@ -926,16 +928,14 @@ void Request::success_response(bool val, RequestAttributes& att)
vector arrayData;
ostringstream oss;
- oss << "";
-
arrayData.push_back(xmlrpc_c::value_boolean(true));
- oss << "true";
- arrayData.push_back(xmlrpc_c::value_boolean(val));
- oss << "" << val << "";
- arrayData.push_back(xmlrpc_c::value_int(SUCCESS));
- oss << "" << SUCCESS << "";
+ make_parameter(oss, 1, "true");
- oss << "";
+ arrayData.push_back(xmlrpc_c::value_boolean(val));
+ make_parameter(oss, 2, val? "true": "false");
+
+ arrayData.push_back(xmlrpc_c::value_int(SUCCESS));
+ make_parameter(oss, 3, SUCCESS);
xmlrpc_c::value_array arrayresult(arrayData);
@@ -952,16 +952,14 @@ void Request::success_response(uint64_t val, RequestAttributes& att)
vector arrayData;
ostringstream oss;
- oss << "";
-
arrayData.push_back(xmlrpc_c::value_boolean(true));
- oss << "true";
- arrayData.push_back(xmlrpc_c::value_i8(val));
- oss << "" << val << "";
- arrayData.push_back(xmlrpc_c::value_int(SUCCESS));
- oss << "" << SUCCESS << "";
+ make_parameter(oss, 1, "true");
- oss << "";
+ arrayData.push_back(xmlrpc_c::value_i8(val));
+ make_parameter(oss, 2, val);
+
+ arrayData.push_back(xmlrpc_c::value_int(SUCCESS));
+ make_parameter(oss, 3, SUCCESS);
xmlrpc_c::value_array arrayresult(arrayData);