diff options
| author | Frank Karlitschek <frank@owncloud.org> | 2014-05-26 10:48:44 +0200 |
|---|---|---|
| committer | Frank Karlitschek <frank@owncloud.org> | 2014-05-26 10:48:44 +0200 |
| commit | 48d0cebc42e98e3fe3fbb7c1b5b4fdc90db4cf2b (patch) | |
| tree | bf0af96a28abd0c5beccc89c645b1b2e3e102999 /lib/private/files | |
| parent | 790c0e8e7ccc44fc859cfa5b97ef2d8aa1df87d7 (diff) | |
| parent | 151c48494e0e1c6b8bed2551c50196a67284db0c (diff) | |
| download | nextcloud-server-48d0cebc42e98e3fe3fbb7c1b5b4fdc90db4cf2b.tar.gz nextcloud-server-48d0cebc42e98e3fe3fbb7c1b5b4fdc90db4cf2b.zip | |
Merge pull request #8674 from owncloud/watch-policy
Add a config option for setting the filesystem watcher policy
Diffstat (limited to 'lib/private/files')
| -rw-r--r-- | lib/private/files/cache/watcher.php | 2 | ||||
| -rw-r--r-- | lib/private/files/storage/common.php | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/lib/private/files/cache/watcher.php b/lib/private/files/cache/watcher.php index 599752a6eff..5a4f53fb73d 100644 --- a/lib/private/files/cache/watcher.php +++ b/lib/private/files/cache/watcher.php @@ -45,7 +45,7 @@ class Watcher { } /** - * @param int $policy either \OC\Files\Cache\Watcher::UPDATE_NEVER, \OC\Files\Cache\Watcher::UPDATE_ONCE, \OC\Files\Cache\Watcher::UPDATE_ALWAYS + * @param int $policy either \OC\Files\Cache\Watcher::CHECK_NEVER, \OC\Files\Cache\Watcher::CHECK_ONCE, \OC\Files\Cache\Watcher::CHECK_ALWAYS */ public function setPolicy($policy) { $this->watchPolicy = $policy; diff --git a/lib/private/files/storage/common.php b/lib/private/files/storage/common.php index b03ae7d0517..cfca8ca008c 100644 --- a/lib/private/files/storage/common.php +++ b/lib/private/files/storage/common.php @@ -7,6 +7,7 @@ */ namespace OC\Files\Storage; +use OC\Files\Cache\Watcher; /** * Storage backend class for providing common filesystem operation methods @@ -280,6 +281,7 @@ abstract class Common implements \OC\Files\Storage\Storage { public function getWatcher($path = '') { if (!isset($this->watcher)) { $this->watcher = new \OC\Files\Cache\Watcher($this); + $this->watcher->setPolicy(\OC::$server->getConfig()->getSystemValue('filesystem_check_changes', Watcher::CHECK_ONCE)); } return $this->watcher; } |