From 5cb1b8176cbaf003bbcc5554341462c13ab8e272 Mon Sep 17 00:00:00 2001
From: mvdbeek <m.vandenbeek@gmail.com>
Date: Fri, 29 Jan 2021 17:15:42 +0100
Subject: [PATCH 1/2] Update instructions for debugging using vscode

---
 doc/source/dev/debugging_galaxy.md | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/doc/source/dev/debugging_galaxy.md b/doc/source/dev/debugging_galaxy.md
index 51c5c34e56a..bca979a49bb 100644
--- a/doc/source/dev/debugging_galaxy.md
+++ b/doc/source/dev/debugging_galaxy.md
@@ -18,17 +18,15 @@ The following instructions assume that you have cloned your Galaxy fork into the
                 "console": "integratedTerminal"
             },
             {
-                "name": "Galaxy debug",
+                "name": "GalaxyFastAPI uvicorn",
                 "type": "python",
                 "request": "launch",
-                "program": "${workspaceFolder}/scripts/paster.py",
-                "args": [
-                    "serve",
-                    "config/galaxy_vscode.ini",
-                    "--log-file",
-                    "galaxy.log",
-                ],
-            }
+                "module": "uvicorn",
+                "args": ["--app-dir", "lib",  "--factory", "galaxy.webapps.galaxy.fast_factory:factory"],
+                "env": {
+                    "GALAXY_CONFIG_FILE": "${workspaceFolder}/config/galaxy.yml"
+                }
+            },
         ]
     }
 

From 7276e4af0c9d8c68eca16b6f236e58c20da8e3da Mon Sep 17 00:00:00 2001
From: mvdbeek <m.vandenbeek@gmail.com>
Date: Fri, 29 Jan 2021 17:17:46 +0100
Subject: [PATCH 2/2] Drop scripts/fapi.py

---
 scripts/fapi.py | 21 ---------------------
 1 file changed, 21 deletions(-)
 delete mode 100644 scripts/fapi.py

diff --git a/scripts/fapi.py b/scripts/fapi.py
deleted file mode 100644
index 1d94458bce5..00000000000
--- a/scripts/fapi.py
+++ /dev/null
@@ -1,21 +0,0 @@
-import uvicorn
-from galaxy_main import (
-    GalaxyConfigBuilder,
-    main,
-)
-
-from galaxy.util.properties import load_app_properties
-from galaxy.webapps.galaxy.buildapp import app_factory
-from galaxy.webapps.galaxy.fast_app import initialize_fast_app
-
-
-def wsgiloop(args, log):
-    config_builder = GalaxyConfigBuilder(args)
-    kwds = config_builder.app_kwds()
-    kwds = load_app_properties(**kwds)
-    gx = app_factory(global_conf=config_builder.global_conf(), **kwds)
-    uvicorn.run(initialize_fast_app(gx))
-
-
-if __name__ == '__main__':
-    main(wsgiloop)