ProPeace/de.forumzfd.twinglecampaign
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

simplify logging

Browse source
This commit is contained in:
Marc Michalsky forumZFD 2021-02-01 15:00:08 +01:00
parent 88474c10ac
commit 4664638299
Signed by untrusted user who does not match committer: marc.koch
GPG key ID: 12406554CFB028B9
2 changed files with 34 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

23
api/v3/TwingleEvent/Sync.php
View file

@ -77,9 +77,6 @@ function _civicrm_api3_twingle_event_Sync_spec(array &$spec) {
*/ */
function civicrm_api3_twingle_event_Sync(array $params): array { function civicrm_api3_twingle_event_Sync(array $params): array {
// For logging purpose
$extensionName = E::LONG_NAME;
// If call provides an API key, use it instead of the API key set // If call provides an API key, use it instead of the API key set
// on the extension settings page // on the extension settings page
$apiKey = empty($params['twingle_api_key']) $apiKey = empty($params['twingle_api_key'])
@ -149,7 +146,8 @@ function civicrm_api3_twingle_event_Sync(array $params): array {
// forward API error message // forward API error message
else { else {
Civi::log()->error( Civi::log()->error(
"$extensionName could retrieve project from TwingleEvent.getsingle", E::LONG_NAME .
' could retrieve project from TwingleEvent.getsingle',
$result $result
); );
return $result; return $result;
@ -251,13 +249,14 @@ function civicrm_api3_twingle_event_Sync(array $params): array {
$event->getResponse('TwingleEvent created'); $event->getResponse('TwingleEvent created');
} catch (Exception $e) { } catch (Exception $e) {
$errors_occurred++; $errors_occurred++;
$errorMessage = $e->getMessage();
Civi::log()->error( Civi::log()->error(
"$extensionName could not create TwingleEvent: $errorMessage", E::LONG_NAME .
' could not create TwingleEvent: ' .
$e->getMessage(),
$event->getResponse() $event->getResponse()
); );
$result_values[$event->getId()] = $event->getResponse( $result_values[$event->getId()] = $event->getResponse(
"TwingleEvent could not get created: $errorMessage" 'TwingleEvent could not get created: ' . $e->getMessage()
); );
} }
} }
@ -348,9 +347,6 @@ function updateLocally(array $event_from_twingle,
array $params, array $params,
TwingleApiCall $twingleApi): array { TwingleApiCall $twingleApi): array {
// For logging purpose
$extensionName = E::LONG_NAME;
try { try {
$event->update($event_from_twingle); $event->update($event_from_twingle);
// If this is a test, do not make db changes // If this is a test, do not make db changes
@ -371,13 +367,14 @@ function updateLocally(array $event_from_twingle,
'Sync' 'Sync'
); );
} catch (Exception $e) { } catch (Exception $e) {
$errorMessage = $e->getMessage();
Civi::log()->error( Civi::log()->error(
"$extensionName could not update TwingleEvent campaign: $errorMessage", E::LONG_NAME .
' could not update TwingleEvent campaign: ' .
$e->getMessage(),
$event->getResponse() $event->getResponse()
); );
return civicrm_api3_create_error( return civicrm_api3_create_error(
"Could not update TwingleEvent campaign: $errorMessage", 'Could not update TwingleEvent campaign: ' . $$e->getMessage(),
$event->getResponse() $event->getResponse()
); );
} }

49
api/v3/TwingleProject/Sync.php
View file

@ -66,9 +66,6 @@ function _civicrm_api3_twingle_project_Sync_spec(array &$spec) {
*/ */
function civicrm_api3_twingle_project_Sync(array $params): array { function civicrm_api3_twingle_project_Sync(array $params): array {
// For logging purpose
$extensionName = E::LONG_NAME;
// If call provides an API key, use it instead of the API key set // If call provides an API key, use it instead of the API key set
// on the extension settings page // on the extension settings page
$apiKey = empty($params['twingle_api_key']) $apiKey = empty($params['twingle_api_key'])
@ -138,7 +135,8 @@ function civicrm_api3_twingle_project_Sync(array $params): array {
// forward API error message // forward API error message
else { else {
Civi::log()->error( Civi::log()->error(
"$extensionName could retrieve project from TwingleProject.getsingle", E::LONG_NAME .
' could retrieve project from TwingleProject.getsingle',
$result $result
); );
return $result; return $result;
@ -161,7 +159,8 @@ function civicrm_api3_twingle_project_Sync(array $params): array {
// If call to TwingleProject.get failed, forward error message // If call to TwingleProject.get failed, forward error message
if ($projects_from_civicrm['is_error'] != 0) { if ($projects_from_civicrm['is_error'] != 0) {
Civi::log()->error( Civi::log()->error(
"$extensionName could retrieve projects from TwingleProject.get", E::LONG_NAME .
' could retrieve projects from TwingleProject.get: ',
$projects_from_civicrm $projects_from_civicrm
); );
return $projects_from_civicrm; return $projects_from_civicrm;
@ -208,13 +207,14 @@ function civicrm_api3_twingle_project_Sync(array $params): array {
$project->getResponse('TwingleProject created'); $project->getResponse('TwingleProject created');
} catch (Exception $e) { } catch (Exception $e) {
$errors_occurred++; $errors_occurred++;
$errorMessage = $e->getMessage();
Civi::log()->error( Civi::log()->error(
"$extensionName could not create TwingleProject: $errorMessage", E::LONG_NAME .
' could not create TwingleProject: ' .
$e->getMessage(),
$project->getResponse() $project->getResponse()
); );
$result_values[$project->getId()] = $project->getResponse( $result_values[$project->getId()] = $project->getResponse(
"TwingleProject could not get created: $errorMessage" "TwingleProject could not get created: " . $e->getMessage()
); );
} }
} }
@ -270,7 +270,7 @@ function civicrm_api3_twingle_project_Sync(array $params): array {
/** /**
* Update a TwingleProject campaign locally * ## Update a TwingleProject campaign locally
* *
* @param array $project_from_twingle * @param array $project_from_twingle
* @param \CRM_TwingleCampaign_BAO_TwingleProject $project * @param \CRM_TwingleCampaign_BAO_TwingleProject $project
@ -284,9 +284,6 @@ function updateLocally(array $project_from_twingle,
array $params, array $params,
TwingleApiCall $twingleApi): array { TwingleApiCall $twingleApi): array {
// For logging purpose
$extensionName = E::LONG_NAME;
try { try {
$project->update($project_from_twingle); $project->update($project_from_twingle);
$project->setEmbedData( $project->setEmbedData(
@ -310,13 +307,14 @@ function updateLocally(array $project_from_twingle,
'Sync' 'Sync'
); );
} catch (Exception $e) { } catch (Exception $e) {
$errorMessage = $e->getMessage();
Civi::log()->error( Civi::log()->error(
"$extensionName could not update TwingleProject campaign: $errorMessage", E::LONG_NAME .
' could not update TwingleProject campaign: ' .
$e->getMessage(),
$project->getResponse() $project->getResponse()
); );
return civicrm_api3_create_error( return civicrm_api3_create_error(
"Could not update TwingleProject campaign: $errorMessage", 'Could not update TwingleProject campaign: ' . $e->getMessage(),
$project->getResponse() $project->getResponse()
); );
} }
@ -337,9 +335,6 @@ function pushToTwingle(TwingleProject $project,
TwingleApiCall $twingleApi, TwingleApiCall $twingleApi,
array $params): array { array $params): array {
// For logging purpose
$extensionName = E::LONG_NAME;
// If this is a test, do not make db changes // If this is a test, do not make db changes
if ($params['is_test']) { if ($params['is_test']) {
return civicrm_api3_create_success( return civicrm_api3_create_success(
@ -354,13 +349,14 @@ function pushToTwingle(TwingleProject $project,
try { try {
$result = $twingleApi->pushProject($project); $result = $twingleApi->pushProject($project);
} catch (Exception $e) { } catch (Exception $e) {
$errorMessage = $e->getMessage();
Civi::log()->error( Civi::log()->error(
"$extensionName could not push TwingleProject to Twingle: $errorMessage", E::LONG_NAME .
' could not push TwingleProject to Twingle: '
. $e->getMessage(),
$project->getResponse() $project->getResponse()
); );
return civicrm_api3_create_error( return civicrm_api3_create_error(
"Could not push TwingleProject to Twingle: $errorMessage", 'Could not push TwingleProject to Twingle: ' . $e->getMessage(),
$project->getResponse() $project->getResponse()
); );
} }
@ -382,13 +378,15 @@ function pushToTwingle(TwingleProject $project,
'Sync' 'Sync'
); );
} catch (Exception $e) { } catch (Exception $e) {
$errorMessage = $e->getMessage();
Civi::log()->error( Civi::log()->error(
"$extensionName pushed TwingleProject to Twingle but local update failed: $errorMessage", E::LONG_NAME .
' pushed TwingleProject to Twingle but local update failed: ' .
$e->getMessage(),
$project->getResponse() $project->getResponse()
); );
return civicrm_api3_create_error( return civicrm_api3_create_error(
"TwingleProject was pushed to Twingle but local update failed: $errorMessage", 'TwingleProject was pushed to Twingle but local update failed: ' .
$e->getMessage(),
$project->getResponse() $project->getResponse()
); );
} }
@ -396,7 +394,8 @@ function pushToTwingle(TwingleProject $project,
// If the curl fails, the $result may be empty // If the curl fails, the $result may be empty
else { else {
Civi::log()->error( Civi::log()->error(
"$extensionName could not push TwingleProject campaign", E::LONG_NAME .
' could not push TwingleProject campaign',
$project->getResponse() $project->getResponse()
); );
return civicrm_api3_create_error( return civicrm_api3_create_error(