From 9da9887cf2a3b1bb1dc5c446b23db6eaa4e894c9 Mon Sep 17 00:00:00 2001
From: Jjungs7 <jeongy95@gmail.com>
Date: Mon, 30 Oct 2023 00:55:17 +0900
Subject: [PATCH] =?UTF-8?q?refactor:=20=EB=A1=9C=EA=B9=85=20=ED=8F=AC?=
 =?UTF-8?q?=EB=A7=B7=20=ED=86=B5=EC=9D=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 deploy/prod.yml           | 57 +++++++++++----------------------------
 poolini/discord_server.py | 14 ++++++----
 2 files changed, 25 insertions(+), 46 deletions(-)

diff --git a/deploy/prod.yml b/deploy/prod.yml
index 14645af..62d0fc3 100644
--- a/deploy/prod.yml
+++ b/deploy/prod.yml
@@ -1,17 +1,12 @@
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: poolini
----
 apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: poolini-deployment
-  namespace: poolini
+  namespace: poolc
   labels:
     app.kubernetes.io/name: poolini
 spec:
-  replicas: 3
+  replicas: 1
   selector:
     matchLabels:
       app.kubernetes.io/name: poolini
@@ -20,11 +15,11 @@ spec:
       labels:
         app.kubernetes.io/name: poolini
     spec:
+      imagePullSecrets:
+        - name: poolc-github-packages-secret
       containers:
         - name: poolini
-          image: poolini:1.14.2
-          ports:
-            - containerPort: 80
+          image: ghcr.io/poolc/poolini:latest
           resources:
             requests:
               cpu: "200m"
@@ -32,34 +27,14 @@ spec:
             limits:
               cpu: "400m"
               memory: "128Mi"
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: poolini-service
-  namespace: poolini
-spec:
-  selector:
-    app.kubernetes.io/name: poolini
-  ports:
-    - protocol: TCP
-      port: 80
-      targetPort: 80
----
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
-  name: poolini-ingress
-  namespace: poolini
-spec:
-  rules:
-  - host: "poolini.poolc.org"
-    http:
-      paths:
-      - pathType: Prefix
-        path: "/"
-        backend:
-          service:
-            name: poolini-service
-            port:
-              number: 80
+          env:
+            - name: DISCORD_TOKEN
+              valueFrom:
+                secretKeyRef:
+                  name: poolc-poolini-secrets
+                  key: DISCORD_TOKEN
+            - name: POOLC_API_ADMIN_TOKEN
+              valueFrom:
+                secretKeyRef:
+                  name: poolc-poolini-secrets
+                  key: POOLC_API_ADMIN_TOKEN
diff --git a/poolini/discord_server.py b/poolini/discord_server.py
index 3507967..f97af03 100644
--- a/poolini/discord_server.py
+++ b/poolini/discord_server.py
@@ -20,13 +20,17 @@
 
 @client.event
 async def on_ready() -> None:
-    logger.info("Captain [%s] on duty!", client.user)
+    logger.info("[init] \"%s\" Captain on duty!", client.user)
 
 
 @client.event
 async def on_member_join(member: discord.Member) -> None:
     active_members_role_id = 1168076737150734416
     active_members_role = discord.utils.get(client.guilds[0].roles, id=active_members_role_id)
+
+    assert isinstance(active_members_role, discord.Role)
+    access_logger.info("[role] \"%s\" assigned role %s", active_members_role.name, member)
+
     await member.add_roles(active_members_role)  # type: ignore (pylance)
 
 
@@ -44,7 +48,7 @@ async def on_message(message) -> None:
     sys.stdout = io.StringIO()
 
     permissions = "user"
-    access_logger.info("[%s]: %s", message.author, message.content)
+    access_logger.info("[chat]: \"%s\" %s", message.author, message.content)
     poolini = cli_static_factory(permissions)
     args = message.content.split(" ")[1:]
     try:
@@ -63,12 +67,12 @@ async def on_error(event, *args) -> None:
     exc_type, exc_value, _ = sys.exc_info()
     assert isinstance(exc_type, BaseException)
 
-    log_msg = f"{'.'.join([exc_type.__module__, exc_type.__name__])}: {exc_value}."
+    log_msg = f"[error/{'.'.join([exc_type.__module__, exc_type.__name__])}] {exc_value}."
     if event == "on_message":
         message = args[0]
-        log_msg += f" (Author: {message.author} / Message: {message.content})"
+        log_msg += f" \"{message.author}\" {message.content}"
     else:
-        log_msg += f" (Msg: {args})"
+        log_msg += f" {args}"
 
     logger.error(log_msg)