Skip to content

Commit

Permalink
Dyn drivers 2 (#253)
Browse files Browse the repository at this point in the history
* options cleanup

Signed-off-by: Kevin Carter <[email protected]>

* remove ui bits

The UI is not something that was ever built out, and only served as a
POC of what we could do. This change removes the UI bits from the core
project as we're not using it and we don't need to support the UI and
its dependencies.

Signed-off-by: Kevin Carter <[email protected]>
  • Loading branch information
Kevin Carter authored Oct 11, 2021
1 parent cd59fcd commit ae023be
Show file tree
Hide file tree
Showing 63 changed files with 9 additions and 59,290 deletions.
1 change: 0 additions & 1 deletion MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
recursive-include directord/components *
recursive-include directord/datastores *
recursive-include directord/drivers *
recursive-include directord/static *
recursive-include directord/templates *
20 changes: 3 additions & 17 deletions directord/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ def _find_drivers(limit_modules=None):
return drivers


def _parse_driver_args(parser, limit_modules=None):
def _parse_driver_args(parser):
"""Return a driver parser.
Any driver found not to be importable will be considered un-available for
Expand All @@ -68,9 +68,7 @@ def _parse_driver_args(parser, limit_modules=None):
:returns: Object
"""

for driver_importer, driver_name in _find_drivers(
limit_modules=limit_modules
):
for driver_importer, driver_name in _find_drivers():
driver = driver_importer.find_module(driver_name).load_module(
driver_name
)
Expand Down Expand Up @@ -152,7 +150,7 @@ def _args(exec_args=None):
default=os.getenv(
"DIRECTORD_DATASTORE", "file:///var/cache/directord"
),
choices=[i for _, i in _find_drivers(limit_modules=["datastores"])],
metavar="STRING",
type=str,
)
server_group.add_argument(
Expand Down Expand Up @@ -324,18 +322,6 @@ def _args(exec_args=None):
metavar="STRING",
default=os.getenv("DIRECTORD_BIND_ADDRESS", "*"),
)
parser_server.add_argument(
"--run-ui",
help="Enable the Directord UI. Default: %(default)s",
action="store_true",
)
parser_server.add_argument(
"--ui-port",
help="UI server bind port. Default: %(default)s",
metavar="INT",
default=int(os.getenv("DIRECTORD_UI_PORT", 9000)),
type=int,
)
parser_client = subparsers.add_parser("client", help="Client mode help")
parser_client.add_argument(
"--server-address",
Expand Down
11 changes: 0 additions & 11 deletions directord/server.py
Original file line number Diff line number Diff line change
Expand Up @@ -933,15 +933,4 @@ def worker_run(self):
),
]

if self.args.run_ui:
# low import to ensure nothing flask is loading needlessly.
from directord import ui # noqa

ui_obj = ui.UI(
args=self.args, jobs=self.return_jobs, nodes=self.workers
)
threads.append(
(self.thread(name="ui", target=ui_obj.start_app), True)
)

self.run_threads(threads=threads)
Empty file removed directord/static/ads.txt
Empty file.
Loading

0 comments on commit ae023be

Please sign in to comment.