diff --git a/ssh_server.py b/ssh_server.py
index 0067d68..6d43235 100644
--- a/ssh_server.py
+++ b/ssh_server.py
@@ -9,18 +9,23 @@ import json
 from typing import Optional
 import logging
 import datetime
+import uuid
 
 async def handle_client(process: asyncssh.SSHServerProcess) -> None:
 # This is the main loop for handling SSH client connections. 
 # Any user interaction should be done here.
 
+    # Give each session a unique name
+    current_task = asyncio.current_task()
+    current_task.set_name(f"session-{uuid.uuid4()}")
+
     process.stdout.write('Welcome to my SSH server, %s!\n' %
                          process.get_extra_info('username'))
     
     try:
         async for line in process.stdin:
             line = line.rstrip('\n')
-            logging.info(f"INPUT: {line}")
+            logger.info(f"INPUT: {line}")
             process.stdout.write('You entered: %s\n' % line)
     except asyncssh.BreakReceived:
         pass
@@ -29,16 +34,16 @@ async def handle_client(process: asyncssh.SSHServerProcess) -> None:
 
 class MySSHServer(asyncssh.SSHServer):
     def connection_made(self, conn: asyncssh.SSHServerConnection) -> None:
-        logging.info(f"SSH connection received from {conn.get_extra_info('peername')[0]}.")
+        logger.info(f"SSH connection received from {conn.get_extra_info('peername')[0]}.")
 
     def connection_lost(self, exc: Optional[Exception]) -> None:
         if exc:
             print('SSH connection error: ' + str(exc), file=sys.stderr)
-            logging.error('SSH connection error: ' + str(exc), file=sys.stderr)
+            logger.error('SSH connection error: ' + str(exc), file=sys.stderr)
 
         else:
             print('SSH connection closed.')
-            logging.info("SSH connection closed.")
+            logger.info("SSH connection closed.")
 
     def begin_auth(self, username: str) -> bool:
         # If the user's password is the empty string, no auth is required
@@ -56,6 +61,23 @@ async def start_server() -> None:
                                  server_host_keys=['ssh_host_key'],
                                  process_factory=handle_client)
 
+class ContextFilter(logging.Filter):
+    """
+    This filter is used to add the current asyncio task name to the log record,
+    so you can group events in the same session together.
+    """
+
+    def filter(self, record):
+
+        task = asyncio.current_task()
+        if task:
+            task_name = task.get_name()
+        else:
+            task_name = "NONE"
+
+        record.task_name = task_name
+
+        return True
 
 def read_accounts() -> dict:
     accounts = dict()
@@ -67,16 +89,21 @@ def read_accounts() -> dict:
 
 #### MAIN ####
 
-# Set up the logging
-logging.basicConfig(
-    filename="ssh_log.log", 
-    level=logging.INFO,
-    format="%(asctime)s %(levelname)s:%(message)s",
-    datefmt="%Y-%m-%d %H:%M:%S. %Z"
-)
-
+# Always use UTC for logging
 logging.Formatter.formatTime = (lambda self, record, datefmt=None: datetime.datetime.fromtimestamp(record.created, datetime.timezone.utc).astimezone().isoformat(sep="T",timespec="milliseconds"))
 
+# Set up the honeypot logger
+logger = logging.getLogger(__name__)  
+logger.setLevel(logging.INFO)  
+
+log_file_handler = logging.FileHandler("ssh_log.log")
+logger.addHandler(log_file_handler)
+
+log_file_handler.setFormatter(logging.Formatter("%(asctime)s %(levelname)s:%(task_name)s %(message)s", datefmt="%Y-%m-%d %H:%M:%S. %Z"))
+
+f = ContextFilter()
+logger.addFilter(f)
+
 # Read the valid accounts
 accounts = read_accounts()