Skip to content

Commit 1256537

Browse files
committed
Use dedicated logger in manage_superusers.py
1 parent 7e1a944 commit 1256537

File tree

2 files changed

+15
-13
lines changed

2 files changed

+15
-13
lines changed

syncmaster/server/scripts/manage_superusers.py

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@
2121
)
2222
from syncmaster.settings.logging import setup_logging
2323

24+
logger = logging.getLogger(__name__)
25+
2426

2527
class SuperuserAppSettings(BaseSettings):
2628
database: DatabaseSettings = Field(
@@ -38,52 +40,52 @@ class SuperuserAppSettings(BaseSettings):
3840

3941

4042
async def add_superusers(session: AsyncSession, usernames: list[str]) -> None:
41-
logging.info("Adding superusers:")
43+
logger.info("Adding superusers:")
4244
result = await session.execute(select(User).where(User.username.in_(usernames)).order_by(User.username))
4345
users = result.scalars().all()
4446

4547
not_found = set(usernames)
4648
for user in users:
4749
user.is_superuser = True
48-
logging.info(" %r", user.username)
50+
logger.info(" %r", user.username)
4951
not_found.discard(user.username)
5052

5153
if not_found:
5254
for username in not_found:
5355
session.add(User(username=username, is_superuser=True))
54-
logging.info(" %r (new user)", username)
56+
logger.info(" %r (new user)", username)
5557

5658
await session.commit()
57-
logging.info("Done.")
59+
logger.info("Done.")
5860

5961

6062
async def remove_superusers(session: AsyncSession, usernames: list[str]) -> None:
61-
logging.info("Removing superusers:")
63+
logger.info("Removing superusers:")
6264
result = await session.execute(select(User).where(User.username.in_(usernames)).order_by(User.username))
6365
users = result.scalars().all()
6466

6567
not_found = set(usernames)
6668
for user in users:
67-
logging.info(" %r", user.username)
69+
logger.info(" %r", user.username)
6870
user.is_superuser = False
6971
not_found.discard(user.username)
7072

7173
if not_found:
72-
logging.info("Not found:")
74+
logger.info("Not found:")
7375
for username in not_found:
74-
logging.info(" %r", username)
76+
logger.info(" %r", username)
7577

7678
await session.commit()
77-
logging.info("Done.")
79+
logger.info("Done.")
7880

7981

8082
async def list_superusers(session: AsyncSession) -> None:
8183
result = await session.execute(select(User).filter_by(is_superuser=True).order_by(User.username))
8284
superusers = result.scalars().all()
83-
logging.info("Listing users with SUPERUSER role:")
85+
logger.info("Listing users with SUPERUSER role:")
8486
for superuser in superusers:
85-
logging.info(" %r", superuser.username)
86-
logging.info("Done.")
87+
logger.info(" %r", superuser.username)
88+
logger.info("Done.")
8789

8890

8991
def create_parser() -> argparse.ArgumentParser:

syncmaster/worker/transfer.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ def run_transfer(run_id: int, engine: Engine, settings: WorkerAppSettings):
8282
controller.perform_transfer()
8383
except Exception as e:
8484
status = Status.FAILED
85-
logger.error("Run %r failed", run_id)
85+
logger.exception("Run %r failed", run_id)
8686
exception = e
8787
else:
8888
status = Status.FINISHED

0 commit comments

Comments
 (0)