From 40d8b67a372b9ddd13378472f238f8f70248ee8c Mon Sep 17 00:00:00 2001 From: Andrzej Popowski Date: Thu, 26 Nov 2015 10:08:13 +0100 Subject: [PATCH] [DataControl] - refactoring logs Change-Id: I1f55f351be7ad6e4f45ee8f446750e17943500ec Signed-off-by: Andrzej Popowski --- src/datacontrol/datacontrol_instance.cc | 107 +++++++++++++++++------- 1 file changed, 77 insertions(+), 30 deletions(-) diff --git a/src/datacontrol/datacontrol_instance.cc b/src/datacontrol/datacontrol_instance.cc index b6c33a05..b0e34caf 100755 --- a/src/datacontrol/datacontrol_instance.cc +++ b/src/datacontrol/datacontrol_instance.cc @@ -494,7 +494,7 @@ int DatacontrolInstance::RunSQLDataControlJob(const std::string& providerId, #define CHECK_EXIST(args, name, out) \ if (!args.contains(name)) {\ - ReportError(TypeMismatchException(name" is required argument"), out);\ + LogAndReportError(TypeMismatchException(name" is required argument"), out);\ return;\ } @@ -521,14 +521,14 @@ void DatacontrolInstance::SQLDataControlConsumerInsert( args.get("insertionData").get(); if (!insertionData.count("columns") || !insertionData.count("values")) { - ReportError(TypeMismatchException( + LogAndReportError(TypeMismatchException( "columns and values is required insertionData argument"), out); return; } if (!insertionData["columns"].is() || !insertionData["values"].is()) { - ReportError(TypeMismatchException("columns and values type must be array"), - out); + LogAndReportError(TypeMismatchException("columns and values type must be array"), + out); return; } @@ -568,11 +568,16 @@ void DatacontrolInstance::SQLDataControlConsumerInsert( ReportSuccess(out); } else { if (result == DATA_CONTROL_ERROR_IO_ERROR) { - ReportError(IOException(get_error_message(result)), out); + LogAndReportError( + IOException(get_error_message(result)), out, + ("RunSQLDataControlJob error: %d (%s)", result, get_error_message(result))); } else if (result == DATA_CONTROL_ERROR_PERMISSION_DENIED) { - ReportError(SecurityException(get_error_message(result)), out); + LogAndReportError( + SecurityException(get_error_message(result)), out, + ("RunSQLDataControlJob error: %d (%s)", result, get_error_message(result))); } else { - ReportError(UnknownException(get_error_message(result)), out); + LogAndReportError(UnknownException(get_error_message(result)), out, + ("RunSQLDataControlJob error: %d (%s)", result, get_error_message(result))); } } } @@ -594,14 +599,14 @@ void DatacontrolInstance::SQLDataControlConsumerUpdate( picojson::object updateData = args.get("updateData").get(); if (!updateData.count("columns") || !updateData.count("values")) { - ReportError(TypeMismatchException( + LogAndReportError(TypeMismatchException( "columns and values is required updateData argument"), out); return; } if (!updateData["columns"].is() || !updateData["values"].is()) { - ReportError(TypeMismatchException( + LogAndReportError(TypeMismatchException( "columns and values type must be array"), out); return; } @@ -644,11 +649,17 @@ void DatacontrolInstance::SQLDataControlConsumerUpdate( ReportSuccess(out); } else { if (result == DATA_CONTROL_ERROR_IO_ERROR) { - ReportError(IOException(get_error_message(result)), out); + LogAndReportError( + IOException(get_error_message(result)), out, + ("RunSQLDataControlJob error: %d (%s)", result, get_error_message(result))); } else if (result == DATA_CONTROL_ERROR_PERMISSION_DENIED) { - ReportError(SecurityException(get_error_message(result)), out); + LogAndReportError( + SecurityException(get_error_message(result)), out, + ("RunSQLDataControlJob error: %d (%s)", result, get_error_message(result))); } else { - ReportError(UnknownException(get_error_message(result)), out); + LogAndReportError( + UnknownException(get_error_message(result)), out, + ("RunSQLDataControlJob error: %d (%s)", result, get_error_message(result))); } } } @@ -677,11 +688,16 @@ void DatacontrolInstance::SQLDataControlConsumerRemove( ReportSuccess(out); } else { if (result == DATA_CONTROL_ERROR_IO_ERROR) { - ReportError(IOException(get_error_message(result)), out); + LogAndReportError( + IOException(get_error_message(result)), out, + ("RunSQLDataControlJob error: %d (%s)", result, get_error_message(result))); } else if (result == DATA_CONTROL_ERROR_PERMISSION_DENIED) { - ReportError(SecurityException(get_error_message(result)), out); + LogAndReportError( + SecurityException(get_error_message(result)), out, + ("RunSQLDataControlJob error: %d (%s)", result, get_error_message(result))); } else { - ReportError(UnknownException(get_error_message(result)), out); + LogAndReportError(UnknownException(get_error_message(result)), out, + ("RunSQLDataControlJob error: %d (%s)", result, get_error_message(result))); } } } @@ -739,11 +755,17 @@ void DatacontrolInstance::SQLDataControlConsumerSelect( ReportSuccess(out); } else { if (result == DATA_CONTROL_ERROR_IO_ERROR) { - ReportError(IOException(get_error_message(result)), out); + LogAndReportError( + IOException(get_error_message(result)), out, + ("RunSQLDataControlJob error: %d (%s)", result, get_error_message(result))); } else if (result == DATA_CONTROL_ERROR_PERMISSION_DENIED) { - ReportError(SecurityException(get_error_message(result)), out); + LogAndReportError( + SecurityException(get_error_message(result)), out, + ("RunSQLDataControlJob error: %d (%s)", result, get_error_message(result))); } else { - ReportError(UnknownException(get_error_message(result)), out); + LogAndReportError( + UnknownException(get_error_message(result)), out, + ("RunSQLDataControlJob error: %d (%s)", result, get_error_message(result))); } } } @@ -776,11 +798,18 @@ void DatacontrolInstance::MappedDataControlConsumerAddvalue( ReportSuccess(out); } else { if (result == DATA_CONTROL_ERROR_IO_ERROR) { - ReportError(IOException(get_error_message(result)), out); + LogAndReportError( + IOException(get_error_message(result)), out, + ("RunMAPDataControlJob error: %d (%s)", result, get_error_message(result))); + } else if (result == DATA_CONTROL_ERROR_PERMISSION_DENIED) { - ReportError(SecurityException(get_error_message(result)), out); + LogAndReportError( + SecurityException(get_error_message(result)), out, + ("RunMAPDataControlJob error: %d (%s)", result, get_error_message(result))); } else { - ReportError(UnknownException(get_error_message(result)), out); + LogAndReportError( + UnknownException(get_error_message(result)), out, + ("RunMAPDataControlJob error: %d (%s)", result, get_error_message(result))); } } } @@ -812,11 +841,17 @@ void DatacontrolInstance::MappedDataControlConsumerRemovevalue( ReportSuccess(out); } else { if (result == DATA_CONTROL_ERROR_IO_ERROR) { - ReportError(IOException(get_error_message(result)), out); + LogAndReportError( + IOException(get_error_message(result)), out, + ("RunMAPDataControlJob error: %d (%s)", result, get_error_message(result))); } else if (result == DATA_CONTROL_ERROR_PERMISSION_DENIED) { - ReportError(SecurityException(get_error_message(result)), out); + LogAndReportError( + SecurityException(get_error_message(result)), out, + ("RunMAPDataControlJob error: %d (%s)", result, get_error_message(result))); } else { - ReportError(UnknownException(get_error_message(result)), out); + LogAndReportError( + UnknownException(get_error_message(result)), out, + ("RunMAPDataControlJob error: %d (%s)", result, get_error_message(result))); } } } @@ -845,11 +880,17 @@ void DatacontrolInstance::MappedDataControlConsumerGetvalue( ReportSuccess(out); } else { if (result == DATA_CONTROL_ERROR_IO_ERROR) { - ReportError(IOException(get_error_message(result)), out); + LogAndReportError( + IOException(get_error_message(result)), out, + ("RunMAPDataControlJob error: %d (%s)", result, get_error_message(result))); } else if (result == DATA_CONTROL_ERROR_PERMISSION_DENIED) { - ReportError(SecurityException(get_error_message(result)), out); + LogAndReportError( + SecurityException(get_error_message(result)), out, + ("RunMAPDataControlJob error: %d (%s)", result, get_error_message(result))); } else { - ReportError(UnknownException(get_error_message(result)), out); + LogAndReportError( + UnknownException(get_error_message(result)), out, + ("RunMAPDataControlJob error: %d (%s)", result, get_error_message(result))); } } } @@ -885,11 +926,17 @@ void DatacontrolInstance::MappedDataControlConsumerUpdatevalue( ReportSuccess(out); } else { if (result == DATA_CONTROL_ERROR_IO_ERROR) { - ReportError(IOException(get_error_message(result)), out); + LogAndReportError( + IOException(get_error_message(result)), out, + ("RunMAPDataControlJob error: %d (%s)", result, get_error_message(result))); } else if (result == DATA_CONTROL_ERROR_PERMISSION_DENIED) { - ReportError(SecurityException(get_error_message(result)), out); + LogAndReportError( + SecurityException(get_error_message(result)), out, + ("RunMAPDataControlJob error: %d (%s)", result, get_error_message(result))); } else { - ReportError(UnknownException(get_error_message(result)), out); + LogAndReportError( + UnknownException(get_error_message(result)), out, + ("RunMAPDataControlJob error: %d (%s)", result, get_error_message(result))); } } } -- 2.34.1