update logger based on review

Author: naderzare

server.py

@@ -8,12 +8,14 @@
 import logging
 import grpc
 import argparse
+import datetime
 
 
 console_logging_level = logging.INFO
 file_logging_level = logging.DEBUG
 
-main_logger = setup_logger("pmservice", "logs/pmservice.log", console_level=console_logging_level, file_level=file_logging_level)
+main_logger = None
+log_dir = None
 
 
 class GrpcAgent:
@@ -168,7 +170,7 @@ def Register(self, register_request: pb2.RegisterRequest, context):
                                     team_name=team_name,
                                     uniform_number=uniform_number,
                                     agent_type=agent_type)
-            logger = setup_logger(f"agent{register_response.uniform_number}_{register_response.client_id}")
+            logger = setup_logger(f"agent{register_response.uniform_number}_{register_response.client_id}", log_dir)
             self.agents[self.shared_number_of_connections.value] = GrpcAgent(agent_type, uniform_number, logger)
         return register_response
 
@@ -198,13 +200,19 @@ def serve(port, shared_lock, shared_number_of_connections):
 
 
 def main():
+    global main_logger, log_dir
+    parser = argparse.ArgumentParser(description='Run play maker server')
+    parser.add_argument('-p', '--rpc-port', required=False, help='The port of the server', default=50051)
+    parser.add_argument('-l', '--log-dir', required=False, help='The directory of the log file', 
+                        default=f'logs/{datetime.datetime.now().strftime("%Y-%m-%d_%H-%M-%S")}')
+    args = parser.parse_args()
+    log_dir = args.log_dir
+    main_logger = setup_logger("pmservice", log_dir, console_level=console_logging_level, file_level=file_logging_level)
     main_logger.info("Starting server")
     manager = Manager()
     shared_lock = Lock()  # Create a Lock for synchronization
     shared_number_of_connections = manager.Value('i', 0)
-    parser = argparse.ArgumentParser(description='Run play maker server')
-    parser.add_argument('-p', '--rpc-port', required=False, help='The port of the server', default=50051)
-    args = parser.parse_args()
+    
     serve(args.rpc_port, shared_lock, shared_number_of_connections)
 
 if __name__ == '__main__':

start-team.py

@@ -6,18 +6,19 @@
 import argparse
 import check_requirements
 from utils.logger_utils import setup_logger
+import datetime
 
 
 # remove logs directory
-os.system("rm -rf logs")
+log_dir = os.path.join(os.getcwd(), 'logs', datetime.datetime.now().strftime('%Y-%m-%d_%H-%M-%S'))
 
 # Set up logging
-start_team_logger = setup_logger('start-team', 'logs/start-team.log', console_level=logging.DEBUG, file_level=logging.DEBUG, console_format_str='%(message)s')
+start_team_logger = setup_logger('start-team', log_dir, console_level=logging.DEBUG, file_level=logging.DEBUG, console_format_str='%(message)s')
 
 def run_server_script(args):
     # Start the server.py script as a new process group
     process = subprocess.Popen(
-        ['python3', 'server.py', '--rpc-port', args.rpc_port],
+        ['python3', 'server.py', '--rpc-port', args.rpc_port, '--log-dir', log_dir],
         preexec_fn=os.setsid,  # Create a new session and set the process group ID
         stdout=subprocess.PIPE,
         stderr=subprocess.STDOUT  # Capture stderr and redirect it to stdout
@@ -43,7 +44,7 @@ def stream_output_to_console(process, prefix):
 
 def stream_output_to_file(process, prefix):
     # Stream output from the process and log it with a prefix
-    logger = setup_logger(prefix, console_level=None, file_level=logging.DEBUG)
+    logger = setup_logger(prefix, log_dir, console_level=None, file_level=logging.DEBUG)
     for line in iter(process.stdout.readline, b''):
         logger.info(line.decode().strip())
         pass
@@ -77,8 +78,8 @@ def kill_process_group(process):
         start_team_logger.debug(f"Started start.sh process with PID: {start_process.pid} with team name {args=}")
 
         # Monitor both processes and log their outputs
-        server_thread = threading.Thread(target=stream_output_to_console, args=(server_process, 'server:'))
-        start_thread = threading.Thread(target=stream_output_to_file, args=(start_process, 'proxy:'))
+        server_thread = threading.Thread(target=stream_output_to_console, args=(server_process, 'server'))
+        start_thread = threading.Thread(target=stream_output_to_file, args=(start_process, 'proxy'))
 
         server_thread.start()
         start_thread.start()

start-team.sh

@@ -1,12 +1,13 @@
 #!/bin/bash
 
-# remove logs directory
-rm -rf logs
-# create logs directory
-if [ ! -d "./logs" ]; then
-  mkdir -p "./logs"
+# create a log directory with the current date and time
+log_dir="logs/$(date +'%Y-%m-%d_%H-%M-%S')"
+if [ ! -d $log_dir ]; then
+  mkdir -p $log_dir
 fi
 
+abs_log_dir_path=$(realpath $log_dir)
+
 # Ensure the script exits if any command fails
 set -e
 # check scripts/proxy directory does not exist, raise error
@@ -60,7 +61,7 @@ python3 check_requirements.py
 
 # Start server.py in the background
 echo "Starting server.py..."
-python3 server.py --rpc-port $rpc_port &
+python3 server.py --rpc-port $rpc_port --log-dir $abs_log_dir_path &
 server_pid=$!
 
 # Function to kill server and team processes on exit
@@ -78,13 +79,13 @@ sleep 2
 
 # Start start.sh script in the correct directory with arguments
 echo "Starting start.sh with team name: $team_name and ..."
-log_dir="logs/proxy.log"
-abspath=$(realpath $log_dir)
+
+start_log_path="$abs_log_dir_path/proxy.log"
 cd scripts/proxy
 if [ "$debug" = true ]; then
-  bash start-debug.sh -t "$team_name" --rpc-port $rpc_port --rpc-type grpc >> $abspath 2>&1 &
+  bash start-debug.sh -t "$team_name" --rpc-port $rpc_port --rpc-type grpc >> $start_log_path 2>&1 &
 else
-  bash start.sh -t "$team_name" --rpc-port $rpc_port --rpc-type grpc >> $abspath 2>&1 &
+  bash start.sh -t "$team_name" --rpc-port $rpc_port --rpc-type grpc >> $start_log_path 2>&1 &
 fi
 start_pid=$!
 

utils/logger_utils.py

@@ -2,7 +2,7 @@
 import os
 
 
-def setup_logger(name, log_file=None, console_level=logging.INFO, file_level=logging.DEBUG, console_format_str=None, file_format_str=None):
+def setup_logger(name, log_dir, console_level=logging.INFO, file_level=logging.DEBUG, console_format_str=None, file_format_str=None):
     """
     Set up a logger that writes to both a file and the console, with different formats and levels.
     
@@ -14,14 +14,14 @@ def setup_logger(name, log_file=None, console_level=logging.INFO, file_level=log
     """
     have_console_handler = console_level is not None
     have_file_handler = file_level is not None
-    if log_file is None:
-        log_file = os.path.join('logs', f'{name}.log')
+    
+    if not os.path.exists(log_dir):
+        os.makedirs(log_dir)
+        
+    log_file = os.path.join(log_dir, f'{name}.log')
     # Directory
     directory = os.path.dirname(log_file)
-    if directory and not os.path.exists(directory):
-        os.makedirs(directory)
 
-    print(f"have_console_handler={have_console_handler}, have_file_handler={have_file_handler}", log_file, directory)
     # Create a custom logger
     logger = logging.getLogger(name)