Skip to content

Commit 9da9887

Browse files
committed
refactor: 로깅 포맷 통일
1 parent a02aa8f commit 9da9887

File tree

2 files changed

+25
-46
lines changed

2 files changed

+25
-46
lines changed

deploy/prod.yml

Lines changed: 16 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,12 @@
1-
apiVersion: v1
2-
kind: Namespace
3-
metadata:
4-
name: poolini
5-
---
61
apiVersion: apps/v1
72
kind: Deployment
83
metadata:
94
name: poolini-deployment
10-
namespace: poolini
5+
namespace: poolc
116
labels:
127
app.kubernetes.io/name: poolini
138
spec:
14-
replicas: 3
9+
replicas: 1
1510
selector:
1611
matchLabels:
1712
app.kubernetes.io/name: poolini
@@ -20,46 +15,26 @@ spec:
2015
labels:
2116
app.kubernetes.io/name: poolini
2217
spec:
18+
imagePullSecrets:
19+
- name: poolc-github-packages-secret
2320
containers:
2421
- name: poolini
25-
image: poolini:1.14.2
26-
ports:
27-
- containerPort: 80
22+
image: ghcr.io/poolc/poolini:latest
2823
resources:
2924
requests:
3025
cpu: "200m"
3126
memory: "64Mi"
3227
limits:
3328
cpu: "400m"
3429
memory: "128Mi"
35-
---
36-
apiVersion: v1
37-
kind: Service
38-
metadata:
39-
name: poolini-service
40-
namespace: poolini
41-
spec:
42-
selector:
43-
app.kubernetes.io/name: poolini
44-
ports:
45-
- protocol: TCP
46-
port: 80
47-
targetPort: 80
48-
---
49-
apiVersion: networking.k8s.io/v1
50-
kind: Ingress
51-
metadata:
52-
name: poolini-ingress
53-
namespace: poolini
54-
spec:
55-
rules:
56-
- host: "poolini.poolc.org"
57-
http:
58-
paths:
59-
- pathType: Prefix
60-
path: "/"
61-
backend:
62-
service:
63-
name: poolini-service
64-
port:
65-
number: 80
30+
env:
31+
- name: DISCORD_TOKEN
32+
valueFrom:
33+
secretKeyRef:
34+
name: poolc-poolini-secrets
35+
key: DISCORD_TOKEN
36+
- name: POOLC_API_ADMIN_TOKEN
37+
valueFrom:
38+
secretKeyRef:
39+
name: poolc-poolini-secrets
40+
key: POOLC_API_ADMIN_TOKEN

poolini/discord_server.py

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,17 @@
2020

2121
@client.event
2222
async def on_ready() -> None:
23-
logger.info("Captain [%s] on duty!", client.user)
23+
logger.info("[init] \"%s\" Captain on duty!", client.user)
2424

2525

2626
@client.event
2727
async def on_member_join(member: discord.Member) -> None:
2828
active_members_role_id = 1168076737150734416
2929
active_members_role = discord.utils.get(client.guilds[0].roles, id=active_members_role_id)
30+
31+
assert isinstance(active_members_role, discord.Role)
32+
access_logger.info("[role] \"%s\" assigned role %s", active_members_role.name, member)
33+
3034
await member.add_roles(active_members_role) # type: ignore (pylance)
3135

3236

@@ -44,7 +48,7 @@ async def on_message(message) -> None:
4448
sys.stdout = io.StringIO()
4549

4650
permissions = "user"
47-
access_logger.info("[%s]: %s", message.author, message.content)
51+
access_logger.info("[chat]: \"%s\" %s", message.author, message.content)
4852
poolini = cli_static_factory(permissions)
4953
args = message.content.split(" ")[1:]
5054
try:
@@ -63,12 +67,12 @@ async def on_error(event, *args) -> None:
6367
exc_type, exc_value, _ = sys.exc_info()
6468
assert isinstance(exc_type, BaseException)
6569

66-
log_msg = f"{'.'.join([exc_type.__module__, exc_type.__name__])}: {exc_value}."
70+
log_msg = f"[error/{'.'.join([exc_type.__module__, exc_type.__name__])}] {exc_value}."
6771
if event == "on_message":
6872
message = args[0]
69-
log_msg += f" (Author: {message.author} / Message: {message.content})"
73+
log_msg += f" \"{message.author}\" {message.content}"
7074
else:
71-
log_msg += f" (Msg: {args})"
75+
log_msg += f" {args}"
7276

7377
logger.error(log_msg)
7478

0 commit comments

Comments
 (0)