bpython
diff --git a/‎bpython/args.py‎
Lines changed: 33 additions & 1 deletion b/‎bpython/args.py‎
Lines changed: 33 additions & 1 deletion
diff --git a/‎bpython/curtsies.py‎
Lines changed: 0 additions & 18 deletions b/‎bpython/curtsies.py‎
Lines changed: 0 additions & 18 deletions
diff --git a/‎doc/sphinx/source/man-bpython.rst‎
Lines changed: 2 additions & 2 deletions b/‎doc/sphinx/source/man-bpython.rst‎
Lines changed: 2 additions & 2 deletions
@@ -25,10 +25,11 @@
 Module to handle command line argument parsing, for all front-ends.
 """
 
+import argparse
 import importlib.util
+import logging
 import os
 import sys
-import argparse
 
 from . import __version__, __copyright__
 from .config import default_config_path, loadini, Struct
@@ -118,6 +119,18 @@ def callback(group):
         action="store_true",
         help=_("Print version and exit."),
     )
+    parser.add_argument(
+        "--log-level",
+        "-l",
+        choices=("debug", "info", "warning", "error", "critical"),
+        default="error",
+        help=_("Set log level for logging"),
+    )
+    parser.add_argument(
+        "--log-output",
+        "-L",
+        help=_("Log output file"),
+    )
 
     if extras is not None:
         extras_group = parser.add_argument_group(extras[0], extras[1])
@@ -147,6 +160,25 @@ def callback(group):
         # Just let Python handle this
         os.execv(sys.executable, [sys.executable] + args)
 
+    # Configure logging handler
+    bpython_logger = logging.getLogger("bpython")
+    curtsies_logger = logging.getLogger("curtsies")
+    bpython_logger.setLevel(options.log_level.upper())
+    curtsies_logger.setLevel(options.log_level.upper())
+    if options.log_output:
+        handler = logging.FileHandler(filename=options.log_output)
+        handler.setFormatter(
+            logging.Formatter(
+                "%(asctime)s: %(name)s: %(levelname)s: %(message)s"
+            )
+        )
+        bpython_logger.addHandler(handler)
+        curtsies_logger.addHandler(handler)
+        bpython_logger.propagate = curtsies_logger.propagate = False
+    else:
+        bpython_logger.addHandler(logging.NullHandler())
+        curtsies_logger.addHandler(logging.NullHandler())
+
     config = Struct()
     loadini(config, options.config)
 
 
@@ -129,12 +129,6 @@ def main(args=None, locals_=None, banner=None, welcome_message=None):
     translations.init()
 
     def curtsies_arguments(parser):
-        parser.add_argument(
-            "--log",
-            "-L",
-            action="count",
-            help=_("log debug messages to bpython.log"),
-        )
         parser.add_argument(
             "--paste",
             "-p",
@@ -150,18 +144,6 @@ def curtsies_arguments(parser):
             curtsies_arguments,
         ),
     )
-    if options.log is None:
-        options.log = 0
-    logging_levels = (logging.ERROR, logging.INFO, logging.DEBUG)
-    level = logging_levels[min(len(logging_levels) - 1, options.log)]
-    logging.getLogger("curtsies").setLevel(level)
-    logging.getLogger("bpython").setLevel(level)
-    if options.log:
-        handler = logging.FileHandler(filename="bpython.log")
-        logging.getLogger("curtsies").addHandler(handler)
-        logging.getLogger("curtsies").propagate = False
-        logging.getLogger("bpython").addHandler(handler)
-        logging.getLogger("bpython").propagate = False
 
     interp = None
     paste = None
 
@@ -57,12 +57,12 @@ The following options are supported by all frontends:
                        exiting. The PYTHONSTARTUP file is not read.
 -q, --quiet            Do not flush the output to stdout.
 -V, --version          Print :program:`bpython`'s version and exit.
+-l <level>, --log-level=<level>   Set logging level
+-L <file>, --log-output=<file>    Set log output file
 
 In addition to the above options, :program:`bpython` also supports the following
 options:
 
--L, --log              Write debugging messages to the file bpython.log. Use
-                       -LL for more verbose logging.
 -p file, --paste=file  Paste in the contents of a file at startup.
 
 In addition to the common options, :program:`bpython-urwid` also supports the