Skip to content

Commit 0bf3e55

Browse files
committed
[Manager] Add beers root dir parameter
Signed-off-by: Valentino Maiorca <[email protected]>
1 parent c6722df commit 0bf3e55

File tree

1 file changed

+14
-3
lines changed

1 file changed

+14
-3
lines changed

src/beers/scripts/beers

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ def _init_manager(
192192
rest_port: int = typer.Option(4242, prompt=True, envvar="MANAGER_REST_PORT"),
193193
rest_host: str = typer.Option("0.0.0.0", prompt=True, envvar="MANAGER_REST_HOST"),
194194
owner_id: str = typer.Option(..., prompt=True, envvar="OWNER_ID"),
195-
db_path: str = typer.Option(..., prompt=True, envvar="BEERS_DB_PATH"),
195+
beers_dir: Path = typer.Option(Path.home() / ".beers", prompt=True, envvar="BEERS_DIR"),
196196
advertise_addr: str = typer.Option(default="tun0", prompt=True),
197197
hostname: str = typer.Option(None, prompt=False, envvar="HOSTNAME"),
198198
#
@@ -230,7 +230,17 @@ def _init_manager(
230230
Process(target=run_event_listener).start()
231231

232232
worker_token: str = client.swarm.attrs["JoinTokens"]["Worker"]
233+
manager_token: str = client.swarm.attrs["JoinTokens"]["Manager"]
234+
235+
beers_dir.mkdir(exist_ok=True, parents=True)
236+
tokens_dir: Path = beers_dir / "tokens"
237+
tokens_dir.mkdir(exist_ok=True, parents=True)
238+
239+
(tokens_dir / "worker").write_text(f"{worker_token}\n", encoding="utf-8")
240+
(tokens_dir / "manager").write_text(f"{manager_token}\n", encoding="utf-8")
241+
233242
pylogger.info(f"WORKER_TOKEN: <{worker_token}>")
243+
pylogger.info(f"MANAGER_TOKEN: <{manager_token}>")
234244

235245
# if traefik:
236246
# _setup_traefik(
@@ -254,8 +264,9 @@ def _init_manager(
254264

255265
from beers.manager import service
256266

257-
db_path: Path = Path(db_path)
258-
service.run(service_host=rest_host, service_port=rest_port, owner_id=owner_id, db_path=db_path)
267+
service.run(
268+
service_host=rest_host, service_port=rest_port, owner_id=owner_id, db_path=beers_dir / "beers_db.sqlite"
269+
)
259270

260271

261272
@service_app.command("worker")

0 commit comments

Comments
 (0)