bitPickups/friendica_2019-12_sharedHosting_hotFix
1
1
Fork 0
Code Pull requests Activity

Merge pull request #7712 from annando/proxy-logging

Browse source 
Some added logging to the proxy functionality to better analyze problems
This commit is contained in:
Philipp 2019-10-06 21:34:34 +02:00 committed by GitHub
commit 47d57cb184
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/Module/Proxy.php
View file

@ -8,6 +8,7 @@ namespace Friendica\Module;
use Friendica\BaseModule; use Friendica\BaseModule;
use Friendica\Core\L10n; use Friendica\Core\L10n;
use Friendica\Core\System; use Friendica\Core\System;
use Friendica\Core\Logger;
use Friendica\Model\Photo; use Friendica\Model\Photo;
use Friendica\Object\Image; use Friendica\Object\Image;
use Friendica\Util\HTTPSignature; use Friendica\Util\HTTPSignature;
@ -92,7 +93,8 @@ class Proxy extends BaseModule
$img_str = $fetchResult->getBody(); $img_str = $fetchResult->getBody();
// If there is an error then return a blank image // If there is an error then return a blank image
if ((substr($fetchResult->getReturnCode(), 0, 1) == '4') || (!$img_str)) { if ((substr($fetchResult->getReturnCode(), 0, 1) == '4') || empty($img_str)) {
Logger::info('Error fetching image', ['image' => $request['url'], 'return' => $fetchResult->getReturnCode(), 'empty' => empty($img_str)]);
self::responseError(); self::responseError();
// stop. // stop.
} }
@ -104,6 +106,7 @@ class Proxy extends BaseModule
$image = new Image($img_str, $mime); $image = new Image($img_str, $mime);
if (!$image->isValid()) { if (!$image->isValid()) {
Logger::info('The image is invalid', ['image' => $request['url'], 'mime' => $mime]);
self::responseError(); self::responseError();
// stop. // stop.
} }
@ -305,6 +308,7 @@ class Proxy extends BaseModule
private static function responseImageHttpCache(Image $img) private static function responseImageHttpCache(Image $img)
{ {
if (is_null($img) || !$img->isValid()) { if (is_null($img) || !$img->isValid()) {
Logger::info('The cached image is invalid');
self::responseError(); self::responseError();
// stop. // stop.
} }