From e45763193fe496cefc6749c45e6a31e62f987d63 Mon Sep 17 00:00:00 2001 From: Jacob Green Date: Tue, 23 Apr 2019 09:08:05 -0700 Subject: [2.2.x] Fixed #30361 -- Increased the default timeout of watchman client to 5 seconds and made it customizable. Made the default timeout of watchman client customizable via DJANGO_WATCHMAN_TIMEOUT environment variable. Backport of ed3c59097a01ed3f32f8a8bed95307fb5c181251 from master --- docs/ref/django-admin.txt | 5 +++++ docs/releases/2.2.1.txt | 4 ++++ 2 files changed, 9 insertions(+) (limited to 'docs') diff --git a/docs/ref/django-admin.txt b/docs/ref/django-admin.txt index 582eabdd3b..80a4303509 100644 --- a/docs/ref/django-admin.txt +++ b/docs/ref/django-admin.txt @@ -888,6 +888,11 @@ more robust change detection, and a reduction in power usage. for optimal performance. See the `watchman documentation`_ for information on how to do this. +.. admonition:: Watchman timeout + + The default timeout of ``Watchman`` client is 5 seconds. You can change it + by setting the ``DJANGO_WATCHMAN_TIMEOUT`` environment variable. + .. _Watchman: https://facebook.github.io/watchman/ .. _pywatchman: https://pypi.org/project/pywatchman/ .. _watchman documentation: https://facebook.github.io/watchman/docs/config.html#ignore_dirs diff --git a/docs/releases/2.2.1.txt b/docs/releases/2.2.1.txt index b7b1f6112d..98f800d455 100644 --- a/docs/releases/2.2.1.txt +++ b/docs/releases/2.2.1.txt @@ -55,3 +55,7 @@ Bugfixes :class:`~django.contrib.sessions.middleware.SessionMiddleware` subclasses, rather than requiring :mod:`django.contrib.sessions` to be in :setting:`INSTALLED_APPS` (:ticket:`30312`). + +* Increased the default timeout when using ``Watchman`` to 5 seconds to prevent + falling back to ``StatReloader`` on larger projects and made it customizable + via the ``DJANGO_WATCHMAN_TIMEOUT`` environment variable (:ticket:`30361`). -- cgit v1.3