CDPP / AMDA_IHM

Commit 7dd0f3cda475b832d97d3668fe18db3fb8d06f0c

Authored by Nathanaël Jourdane
1 parent 1e106ce5
Exists in master and in 109 other branches 10098, 10178, 5390, 6629, 6728, 6920, 7494, 7497, 7616, 8459, 8528, 8928, 9014, 9016Bis, 9017, 9049, 9084, 9259, 9326, 9345, 9505, 9660, 9750, 9750.bck, 9800, 9980, FER_10285, FER_10400, FER_10435, FER_10557, FER_10663, FER_10765, FER_10828, FER_10828_2, FER_10829, FER_10836, FER_10852, FER_10934, FER_11100, FER_11242, FER_11478, FER_11500, FER_11537, FER_11586, FER_11588, FER_5119, FER_5165, FER_6265, FER_6860, FER_6899, FER_6951, FER_7618, FER_7862, FER_8455, FER_9629, FER_9660, FER_9915, FER_CR41, FER_CR42, FER_CR43, FER_TFCat, Histo1D2D, MAZ_10936, MAZ_11362, MAZ_11427, MAZ_6018, MAZ_9016_New, MAZ_FIX_9016, New_ColorMaps, SpeasyGet, akkodis/amdadev, alias, amdadev, amdadev_test, anr_tempete, catalog-histo, create-user, cu2022, density_maps, develop, epn-tap, expression-parser-bre, frames-transformation, hapi, homePage, master_vge, minimize, mlplasmas, multiplot, new-save-plot-request, openam, plot-request, plot-request-update, plot-tt-catalog, remoteData, rm_5118, rm_5776, rm_6912, rm_6912_bis, rm_7926, rm_8932, save-other-requests, save-plot, save-plot-request, shared-objects-updater, special-params, sum-components-indexes, test-merge, ws_get_catalog

Fix bug when a regristry returns a timeout error.

Showing 2 changed files with 7 additions and 5 deletions   Show diff stats
Inline Side-by-side
php/classes/VOTableMgr.php
  Diff comments   View file @7dd0f3c
... ... @@ -32,6 +32,7 @@ class VOTableMgr {
32 32 {
33 33 $this->is_little_endian = array_values(unpack('L1L', pack('V', 1)))[0] == 1;
34 34  
  35 + libxml_set_streams_context(stream_context_create([ 'http' => [ 'method' => 'GET', 'timeout' => '5' ]]));
35 36 // BRE - Add proxy host if exists
36 37 $context = ProxyUtils::getStreamContextWithProxy();
37 38 if (isset($context)) {
... ... @@ -464,7 +465,6 @@ class VOTableMgr {
464 465 }
465 466 $data = Array();
466 467 $fields = $this->xp->query($this->queryFields());
467   - $resource = $this->xp->query($this->queryResource());
468 468 $nb_columns = $fields->length;
469 469 $row = Array();
470 470 $n_value = 0; // index of current value
... ...
php/epntap.php
  Diff comments   View file @7dd0f3c
... ... @@ -96,8 +96,9 @@ function getServices() {
96 96  
97 97 $regNumber = 0;
98 98 $r = [];
99   - $lastErrorMessage = null;
100   - for(; $regNumber<count($registriesURL) ; $regNumber++) {
  99 + $lastErrorMessage = '';
  100 + for(; $regNumber < count($registriesURL) ; $regNumber++) {
  101 + error_log('trying ' . $registriesURL[$regNumber] . '...');
101 102 $r = request($registriesURL[$regNumber], $query);
102 103 if($r['success']) {
103 104 // Add several other parameters and remove AMDA
... ... @@ -115,12 +116,13 @@ function getServices() {
115 116 }
116 117 break;
117 118 } else {
118   - $lastErrorMesage = 'Last tried registry (' . $registriesURL[$regNumber] . ') returned this error: ' . $r['msg'] . '.';
  119 + $lastErrorMesage = $registriesURL[$regNumber] . ' returned this error: ' . $r['msg'] . '.';
  120 + error_log($lastErrorMesage);
119 121 }
120 122 }
121 123  
122 124 if(!$r['success']) {
123   - $r['msg'] = 'Can not access any of these registries: ' . implode(', ', $registriesURL) . ', last error message is ' . $lastErrorMessage;
  125 + $r['msg'] = 'Can not access registry: ' . $lastErrorMessage;
124 126 }
125 127 return $r;
126 128 }
... ...