hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-16 14:33:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
aynsix
2021-06-23 10:43:42 +03:00
parent 79d303ec86
commit bc56c97e33
3 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/Alchemy/Phrasea/Command/NetworkProxiesTestCommand.php
View File

@@ -35,13 +35,12 @@ class NetworkProxiesTestCommand extends Command
// test http-proxy // test http-proxy
if ($proxyConfig->getHttpProxyConfiguration() != null) { if ($proxyConfig->getHttpProxyConfiguration() != null) {
$httpProxy = $proxyConfig->getHttpProxyConfiguration(); $httpProxy = $proxyConfig->getHttpProxyConfiguration();
array_merge($clientOptions, ['proxy' => $httpProxy]); $clientOptions = array_merge($clientOptions, ['proxy' => $httpProxy]);
$client = new Client($clientOptions); $client = new Client($clientOptions);
try { try {
$response = $client->get($urlTest); $response = $client->get($urlTest);
$output->writeln("<info>Test outgoing connection with proxy " . $httpProxy ." success with status code : " . $response->getStatusCode() . " </info>"); $output->writeln("<info>Test outgoing connection with proxy " . $httpProxy ." success with status code : " . $response->getStatusCode() . " </info>");
} catch(\Exception $e) { } catch(\Exception $e) {
$output->writeln("<comment>Outgoing connection error with proxy " . $httpProxy . " , " . $e->getMessage() . "</comment>"); $output->writeln("<comment>Outgoing connection error with proxy " . $httpProxy . " , " . $e->getMessage() . "</comment>");

2
lib/Alchemy/Phrasea/WorkerManager/Worker/AssetsIngestWorker.php
View File

@@ -44,7 +44,7 @@ class AssetsIngestWorker implements WorkerInterface
// add proxy in each request if defined in configuration // add proxy in each request if defined in configuration
if ($proxyConfig->getHttpProxyConfiguration() != null) { if ($proxyConfig->getHttpProxyConfiguration() != null) {
array_merge($clientOptions, ['proxy' => $proxyConfig->getHttpProxyConfiguration()]); $clientOptions = array_merge($clientOptions, ['proxy' => $proxyConfig->getHttpProxyConfiguration()]);
} }
$uploaderClient = new Client($clientOptions); $uploaderClient = new Client($clientOptions);

4
lib/Alchemy/Phrasea/WorkerManager/Worker/CreateRecordWorker.php
View File

@@ -64,7 +64,7 @@ class CreateRecordWorker implements WorkerInterface
// add proxy in each request if defined in configuration // add proxy in each request if defined in configuration
if ($proxyConfig->getHttpProxyConfiguration() != null) { if ($proxyConfig->getHttpProxyConfiguration() != null) {
array_merge($clientOptions, ['proxy' => $proxyConfig->getHttpProxyConfiguration()]); $clientOptions = array_merge($clientOptions, ['proxy' => $proxyConfig->getHttpProxyConfiguration()]);
} }
$uploaderClient = new Client($clientOptions); $uploaderClient = new Client($clientOptions);
@@ -96,7 +96,7 @@ class CreateRecordWorker implements WorkerInterface
$clientOptions = []; $clientOptions = [];
// add proxy in each request if defined in configuration // add proxy in each request if defined in configuration
if ($proxyConfig->getHttpProxyConfiguration() != null) { if ($proxyConfig->getHttpProxyConfiguration() != null) {
array_merge($clientOptions, ['proxy' => $proxyConfig->getHttpProxyConfiguration()]); $clientOptions = array_merge($clientOptions, ['proxy' => $proxyConfig->getHttpProxyConfiguration()]);
} }
//download the asset //download the asset