From 3d8a300b77f2c9a5ba4a899b81ae3ab3883097eb Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Fri, 3 Feb 2017 13:09:33 +0100 Subject: [PATCH 1/2] Lower log levels of resource locator Signed-off-by: Robin Appelman --- lib/private/Template/CSSResourceLocator.php | 4 ++-- lib/private/Template/ResourceLocator.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/private/Template/CSSResourceLocator.php b/lib/private/Template/CSSResourceLocator.php index b306e078cd2..3a474a1ecfd 100644 --- a/lib/private/Template/CSSResourceLocator.php +++ b/lib/private/Template/CSSResourceLocator.php @@ -91,11 +91,11 @@ class CSSResourceLocator extends ResourceLocator { $this->append($root, $this->scssCacher->getCachedSCSS($app, $file), false); return true; } else { - $this->logger->error('Failed to compile and/or save '.$root.'/'.$file, ['app' => 'core']); + $this->logger->warning('Failed to compile and/or save '.$root.'/'.$file, ['app' => 'core']); return false; } } else { - $this->logger->error('Scss is disabled for '.$root.'/'.$file.', ignoring', ['app' => 'core']); + $this->logger->debug('Scss is disabled for '.$root.'/'.$file.', ignoring', ['app' => 'core']); return true; } } diff --git a/lib/private/Template/ResourceLocator.php b/lib/private/Template/ResourceLocator.php index 420317d27ac..e22ebdcab7d 100755 --- a/lib/private/Template/ResourceLocator.php +++ b/lib/private/Template/ResourceLocator.php @@ -75,7 +75,7 @@ abstract class ResourceLocator { $this->doFind($resource); } catch (ResourceNotFoundException $e) { $resourceApp = substr($resource, 0, strpos($resource, '/')); - $this->logger->error('Could not find resource file "' . $e->getResourcePath() . '"', ['app' => $resourceApp]); + $this->logger->debug('Could not find resource file "' . $e->getResourcePath() . '"', ['app' => $resourceApp]); } } if (!empty($this->theme)) { @@ -84,7 +84,7 @@ abstract class ResourceLocator { $this->doFindTheme($resource); } catch (ResourceNotFoundException $e) { $resourceApp = substr($resource, 0, strpos($resource, '/')); - $this->logger->error('Could not find resource file "' . $e->getResourcePath() . '"', ['app' => $resourceApp]); + $this->logger->debug('Could not find resource file "' . $e->getResourcePath() . '"', ['app' => $resourceApp]); } } } From 942465c8b1b09eb1d77585ec12ea7868130f9571 Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Fri, 3 Feb 2017 11:52:01 -0600 Subject: [PATCH 2/2] fix unit tests Signed-off-by: Morris Jobke --- tests/lib/Template/ResourceLocatorTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/lib/Template/ResourceLocatorTest.php b/tests/lib/Template/ResourceLocatorTest.php index 17326f6c691..580dfd60d0e 100644 --- a/tests/lib/Template/ResourceLocatorTest.php +++ b/tests/lib/Template/ResourceLocatorTest.php @@ -69,7 +69,7 @@ class ResourceLocatorTest extends \Test\TestCase { ->with('foo') ->will($this->throwException(new ResourceNotFoundException('foo', 'map'))); $this->logger->expects($this->exactly(2)) - ->method('error') + ->method('debug') ->with($this->stringContains('map/foo')); /** @var \OC\Template\ResourceLocator $locator */ $locator->find(array('foo'));