diff options
| author | Robin Appelman <robin@icewind.nl> | 2017-02-06 12:52:57 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-06 12:52:57 +0100 |
| commit | b55f5af7eaab6f827989407fa7b8d51cbb877eab (patch) | |
| tree | 409cbb9cc8b50dd0bef4ea48531421f5028efb08 | |
| parent | fa96b9e356cc52207a7a8ea5caf569203157ad1b (diff) | |
| parent | 942465c8b1b09eb1d77585ec12ea7868130f9571 (diff) | |
| download | nextcloud-server-b55f5af7eaab6f827989407fa7b8d51cbb877eab.tar.gz nextcloud-server-b55f5af7eaab6f827989407fa7b8d51cbb877eab.zip | |
Merge pull request #3364 from nextcloud/sass-logging
Lower log levels of resource locator
| -rw-r--r-- | lib/private/Template/CSSResourceLocator.php | 4 | ||||
| -rwxr-xr-x | lib/private/Template/ResourceLocator.php | 4 | ||||
| -rw-r--r-- | tests/lib/Template/ResourceLocatorTest.php | 2 |
3 files changed, 5 insertions, 5 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]); } } } 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')); |