diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Cache] improve logged messages

Browse Source
This commit is contained in:
Nicolas Grekas 2019-05-22 20:58:27 +02:00
parent 1cd99eaaa8
commit 257f3f176e
6 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Symfony/Component/Cache/Adapter/AbstractTagAwareAdapter.php
View File

@ -253,7 +253,8 @@ abstract class AbstractTagAwareAdapter implements TagAwareAdapterInterface, TagA
} }
} catch (\Exception $e) { } catch (\Exception $e) {
} }
CacheItem::log($this->logger, 'Failed to delete key "{key}"', ['key' => $key, 'exception' => $e]); $message = 'Failed to delete key "{key}"'.($e instanceof \Exception ? ': '.$e->getMessage() : '.');
CacheItem::log($this->logger, $message, ['key' => $key, 'exception' => $e]);
$ok = false; $ok = false;
} }

2
src/Symfony/Component/Cache/Adapter/RedisTagAwareAdapter.php
View File

@ -198,7 +198,7 @@ class RedisTagAwareAdapter extends AbstractTagAwareAdapter
$info = $host->info('Server'); $info = $host->info('Server');
$info = isset($info['Server']) ? $info['Server'] : $info; $info = isset($info['Server']) ? $info['Server'] : $info;
if (version_compare($info['redis_version'], '3.2', '<')) { if (version_compare($info['redis_version'], '3.2', '<')) {
CacheItem::log($this->logger, 'Redis server needs to be version 3.2 or higher, your Redis server was detected as {version}', ['version' => $info['redis_version']]); CacheItem::log($this->logger, 'Redis server needs to be version 3.2 or higher, your Redis server was detected as '.$info['redis_version']);
return $this->redisServerSupportSPOP = false; return $this->redisServerSupportSPOP = false;
} }

9
src/Symfony/Component/Cache/Simple/AbstractCache.php
View File

@ -56,7 +56,7 @@ abstract class AbstractCache implements Psr16CacheInterface, LoggerAwareInterfac
return $value; return $value;
} }
} catch (\Exception $e) { } catch (\Exception $e) {
CacheItem::log($this->logger, 'Failed to fetch key "{key}"', ['key' => $key, 'exception' => $e]); CacheItem::log($this->logger, 'Failed to fetch key "{key}": '.$e->getMessage(), ['key' => $key, 'exception' => $e]);
} }
return $default; return $default;
@ -90,7 +90,7 @@ abstract class AbstractCache implements Psr16CacheInterface, LoggerAwareInterfac
try { try {
$values = $this->doFetch($ids); $values = $this->doFetch($ids);
} catch (\Exception $e) { } catch (\Exception $e) {
CacheItem::log($this->logger, 'Failed to fetch requested values', ['keys' => $keys, 'exception' => $e]); CacheItem::log($this->logger, 'Failed to fetch values: '.$e->getMessage(), ['keys' => $keys, 'exception' => $e]);
$values = []; $values = [];
} }
$ids = array_combine($ids, $keys); $ids = array_combine($ids, $keys);
@ -129,7 +129,8 @@ abstract class AbstractCache implements Psr16CacheInterface, LoggerAwareInterfac
foreach (\is_array($e) ? $e : array_keys($valuesById) as $id) { foreach (\is_array($e) ? $e : array_keys($valuesById) as $id) {
$keys[] = substr($id, \strlen($this->namespace)); $keys[] = substr($id, \strlen($this->namespace));
} }
CacheItem::log($this->logger, 'Failed to save values', ['keys' => $keys, 'exception' => $e instanceof \Exception ? $e : null]); $message = 'Failed to save values'.($e instanceof \Exception ? ': '.$e->getMessage() : '.');
CacheItem::log($this->logger, $message, ['keys' => $keys, 'exception' => $e instanceof \Exception ? $e : null]);
return false; return false;
} }
@ -175,7 +176,7 @@ abstract class AbstractCache implements Psr16CacheInterface, LoggerAwareInterfac
yield $key => $value; yield $key => $value;
} }
} catch (\Exception $e) { } catch (\Exception $e) {
CacheItem::log($this->logger, 'Failed to fetch requested values', ['keys' => array_values($keys), 'exception' => $e]); CacheItem::log($this->logger, 'Failed to fetch values: '.$e->getMessage(), ['keys' => array_values($keys), 'exception' => $e]);
} }
foreach ($keys as $key) { foreach ($keys as $key) {

6
src/Symfony/Component/Cache/Traits/AbstractAdapterTrait.php
View File

@ -52,7 +52,7 @@ trait AbstractAdapterTrait
$isHit = true; $isHit = true;
} }
} catch (\Exception $e) { } catch (\Exception $e) {
CacheItem::log($this->logger, 'Failed to fetch key "{key}"', ['key' => $key, 'exception' => $e]); CacheItem::log($this->logger, 'Failed to fetch key "{key}": '.$e->getMessage(), ['key' => $key, 'exception' => $e]);
} }
return $f($key, $value, $isHit); return $f($key, $value, $isHit);
@ -74,7 +74,7 @@ trait AbstractAdapterTrait
try { try {
$items = $this->doFetch($ids); $items = $this->doFetch($ids);
} catch (\Exception $e) { } catch (\Exception $e) {
CacheItem::log($this->logger, 'Failed to fetch requested items', ['keys' => $keys, 'exception' => $e]); CacheItem::log($this->logger, 'Failed to fetch items: '.$e->getMessage(), ['keys' => $keys, 'exception' => $e]);
$items = []; $items = [];
} }
$ids = array_combine($ids, $keys); $ids = array_combine($ids, $keys);
@ -129,7 +129,7 @@ trait AbstractAdapterTrait
yield $key => $f($key, $value, true); yield $key => $f($key, $value, true);
} }
} catch (\Exception $e) { } catch (\Exception $e) {
CacheItem::log($this->logger, 'Failed to fetch requested items', ['keys' => array_values($keys), 'exception' => $e]); CacheItem::log($this->logger, 'Failed to fetch items: '.$e->getMessage(), ['keys' => array_values($keys), 'exception' => $e]);
} }
foreach ($keys as $key) { foreach ($keys as $key) {

7
src/Symfony/Component/Cache/Traits/AbstractTrait.php
View File

@ -94,7 +94,7 @@ trait AbstractTrait
try { try {
return $this->doHave($id); return $this->doHave($id);
} catch (\Exception $e) { } catch (\Exception $e) {
CacheItem::log($this->logger, 'Failed to check if key "{key}" is cached', ['key' => $key, 'exception' => $e]); CacheItem::log($this->logger, 'Failed to check if key "{key}" is cached: '.$e->getMessage(), ['key' => $key, 'exception' => $e]);
return false; return false;
} }
@ -122,7 +122,7 @@ trait AbstractTrait
try { try {
return $this->doClear($this->namespace) || $cleared; return $this->doClear($this->namespace) || $cleared;
} catch (\Exception $e) { } catch (\Exception $e) {
CacheItem::log($this->logger, 'Failed to clear the cache', ['exception' => $e]); CacheItem::log($this->logger, 'Failed to clear the cache: '.$e->getMessage(), ['exception' => $e]);
return false; return false;
} }
@ -166,7 +166,8 @@ trait AbstractTrait
} }
} catch (\Exception $e) { } catch (\Exception $e) {
} }
CacheItem::log($this->logger, 'Failed to delete key "{key}"', ['key' => $key, 'exception' => $e]); $message = 'Failed to delete key "{key}"'.($e instanceof \Exception ? ': '.$e->getMessage() : '.');
CacheItem::log($this->logger, $message, ['key' => $key, 'exception' => $e]);
$ok = false; $ok = false;
} }

6
src/Symfony/Component/Cache/Traits/ArrayTrait.php
View File

@ -128,8 +128,8 @@ trait ArrayTrait
$serialized = serialize($value); $serialized = serialize($value);
} catch (\Exception $e) { } catch (\Exception $e) {
$type = \is_object($value) ? \get_class($value) : \gettype($value); $type = \is_object($value) ? \get_class($value) : \gettype($value);
$message = sprintf('Failed to save key "{key}" of type %s%s', $type, $e instanceof \Exception ? ': '.$e->getMessage() : '.'); $message = sprintf('Failed to save key "{key}" of type %s: %s', $type, $e->getMessage());
CacheItem::log($this->logger, $message, ['key' => substr($id, \strlen($this->namespace)), 'exception' => $e instanceof \Exception ? $e : null]); CacheItem::log($this->logger, $message, ['key' => substr($id, \strlen($this->namespace)), 'exception' => $e]);
return; return;
} }
@ -151,7 +151,7 @@ trait ArrayTrait
try { try {
$value = unserialize($value); $value = unserialize($value);
} catch (\Exception $e) { } catch (\Exception $e) {
CacheItem::log($this->logger, 'Failed to unserialize key "{key}"', ['key' => $key, 'exception' => $e]); CacheItem::log($this->logger, 'Failed to unserialize key "{key}": '.$e->getMessage(), ['key' => $key, 'exception' => $e]);
$value = false; $value = false;
} }
if (false === $value) { if (false === $value) {