Merge pull request #2230 from Drakkar-Software/dev

Master merge
Drakkar-Software · Feb 13, 2023 · 68490d1 · 68490d1
2 parents ca3536b + 062d97e
commit 68490d1
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/octobot/constants.py b/octobot/constants.py
@@ -148,6 +148,8 @@
 # system
 ENABLE_CLOCK_SYNCH = os_util.parse_boolean_environment_var("ENABLE_CLOCK_SYNCH", "True")
 ENABLE_SYSTEM_WATCHER = os_util.parse_boolean_environment_var("ENABLE_SYSTEM_WATCHER", "True")
+DUMP_USED_RESOURCES = os_util.parse_boolean_environment_var("DUMP_USED_RESOURCES", "False")
+USED_RESOURCES_OUTPUT = os.getenv("USED_RESOURCES_OUTPUT", "system_resources.csv")
 
 # errors
 ERRORS_URL = os.getenv("ERRORS_OCTOBOT_ONLINE_URL", "https://errors.octobot.online/")

diff --git a/octobot/octobot.py b/octobot/octobot.py
@@ -220,7 +220,10 @@ async def _ensure_clock(self):
 
     async def _ensure_watchers(self):
         if constants.ENABLE_SYSTEM_WATCHER:
-            await system_resources_watcher.start_system_resources_watcher()
+            await system_resources_watcher.start_system_resources_watcher(
+                constants.DUMP_USED_RESOURCES,
+                constants.USED_RESOURCES_OUTPUT
+            )
 
     def _log_config(self):
         exchanges = [

diff --git a/requirements.txt b/requirements.txt
@@ -2,14 +2,14 @@
 cython==0.29.32
 
 # Drakkar-Software requirements
-OctoBot-Commons==1.8.9
-OctoBot-Trading==2.3.18
+OctoBot-Commons==1.8.10
+OctoBot-Trading==2.3.20
 OctoBot-Evaluators==1.8.3
 OctoBot-Tentacles-Manager==2.8.3
 OctoBot-Services==1.4.3
 OctoBot-Backtesting==1.8.0
 Async-Channel==2.1.0
-trading-backend==1.0.18
+trading-backend==1.0.19
 
 ## Others
 colorlog==4.7.2