Merge branch 'dev' into dev

1 files changed, 6 insertions, 3 deletions

diff --git a/launch.py b/launch.py
index b103c8f3..e4c2ce99 100644
--- a/launch.py
+++ b/launch.py
@@ -1,6 +1,5 @@
 from modules import launch_utils

 

-

 args = launch_utils.args

 python = launch_utils.python

 git = launch_utils.git

@@ -18,6 +17,7 @@ run_pip = launch_utils.run_pip
 check_run_python = launch_utils.check_run_python

 git_clone = launch_utils.git_clone

 git_pull_recursive = launch_utils.git_pull_recursive

+list_extensions = launch_utils.list_extensions

 run_extension_installer = launch_utils.run_extension_installer

 prepare_environment = launch_utils.prepare_environment

 configure_for_tests = launch_utils.configure_for_tests

@@ -25,8 +25,11 @@ start = launch_utils.start
 

 

 def main():

-    if not args.skip_prepare_environment:

-        prepare_environment()

+    launch_utils.startup_timer.record("initial startup")

+

+    with launch_utils.startup_timer.subcategory("prepare environment"):

+        if not args.skip_prepare_environment:

+            prepare_environment()

 

     if args.test_server:

         configure_for_tests()