From d36804fe82bf3356ba5df7210711007327f14161 Mon Sep 17 00:00:00 2001
From: iLLiCiTiT <jakub.trllo@gmail.com>
Date: Fri, 11 Dec 2020 10:59:15 +0100
Subject: [PATCH] AVALON_TIMEOUT environment is filled by settings value

---
 pype/modules/avalon_apps/avalon_app.py | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/pype/modules/avalon_apps/avalon_app.py b/pype/modules/avalon_apps/avalon_app.py
index 5f1690cf91..51ab7b4ca5 100644
--- a/pype/modules/avalon_apps/avalon_app.py
+++ b/pype/modules/avalon_apps/avalon_app.py
@@ -30,9 +30,15 @@ class AvalonModule(PypeModule, ITrayModule, IRestApi):
         if not thumbnail_root:
             thumbnail_root = avalon_settings["AVALON_THUMBNAIL_ROOT"]
 
+        # Mongo timeout
+        avalon_mongo_timeout = os.environ.get("AVALON_TIMEOUT")
+        if not avalon_mongo_timeout:
+            avalon_mongo_timeout = avalon_settings["avalon_mongo_timeout"]
+
         self.thumbnail_root = thumbnail_root
         self.avalon_mongo_url = avalon_mongo_url
-        self.avalon_settings = avalon_settings
+        self.avalon_mongo_timeout = avalon_mongo_timeout
+
         self.schema_path = os.path.join(
             os.path.dirname(pype.PACKAGE_DIR),
             "schema"
@@ -63,12 +69,12 @@ class AvalonModule(PypeModule, ITrayModule, IRestApi):
             # TODO thumbnails root should be multiplafrom
             # - thumbnails root
             "AVALON_THUMBNAIL_ROOT": self.thumbnail_root,
+            # - mongo timeout in ms
+            "AVALON_TIMEOUT": str(self.avalon_mongo_timeout),
 
             # May be modifiable?
             # - mongo database name where projects are stored
             "AVALON_DB": "avalon",
-            # - mongo timeout in ms
-            "AVALON_TIMEOUT": "1000",
 
             # Avalon environments not used in code
             "AVALON_DEBUG": "1",