diff --git a/python/pysmurf/core/server_scripts/Common.py b/python/pysmurf/core/server_scripts/Common.py
index c60eec4c5..a214d3194 100755
--- a/python/pysmurf/core/server_scripts/Common.py
+++ b/python/pysmurf/core/server_scripts/Common.py
@@ -23,6 +23,7 @@
 import subprocess
 import sys
 import zipfile
+import logging
 
 import pyrogue
 
@@ -48,6 +49,16 @@ def process_args(args):
         if it was not defined.
     """
 
+    # Setup logging
+    logger = logging.getLogger()
+    logger.setLevel(args.log_level)
+    # set up a handler with timestamps
+    handler = logging.StreamHandler()
+    handler.setLevel(args.log_level)
+    formatter = logging.Formatter("[%(asctime)s] %(levelname)s:%(name)s: %(msg)s")
+    handler.setFormatter(formatter)
+    logger.addHandler(handler)
+
     # Verify if the zip file was specified
     if args.zip_file:
         zip_file_name = args.zip_file
@@ -204,5 +215,9 @@ def make_parser(parser=None):
     group.add_argument('--use-qt', action='store_true', dest='use_qt',
                        default=False, help="Use the QT ."
                        )
+    group.add_argument('--log-level', type=str.upper, help="Set the logging level.",
+                       choices=["DEBUG", "INFO", "WARNING", "ERROR", "CRITICAL"],
+                       default="WARNING"
+                       )
 
     return parser