Skip to content

Commit

Permalink
remove unused coloredlogs code
Browse files Browse the repository at this point in the history
  • Loading branch information
d-biehl committed Nov 15, 2022
1 parent 9e8425d commit 82cc095
Show file tree
Hide file tree
Showing 9 changed files with 48 additions and 140 deletions.
1 change: 0 additions & 1 deletion .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,6 @@
"--mode",
"tcp",
"--log",
"--log-colored",
"--log-level",
"TRACE",
//"--log-json-rpc-data",
Expand Down
53 changes: 17 additions & 36 deletions log.ini
Original file line number Diff line number Diff line change
Expand Up @@ -10,124 +10,105 @@
keys: root

[formatters]
#keys: detailed,simple,colored_simple
keys: detailed,simple,colored_detailed
keys: detailed,simple

[handlers]
keys: console, colored_console
#keys: console
keys: console

[formatter_simple]
#format=%(asctime)s - %(name)s - %(levelname)s - %(message)s
format: %(name)s:%(levelname)s: %(message)s

[formatter_colored_simple]
class: coloredlogs.ColoredFormatter
#format=%(asctime)s - %(name)s - %(levelname)s - %(message)s
format: %(name)s:%(levelname)s: %(message)s

[formatter_detailed]
format: %(name)s:%(levelname)s %(threadName)s(%(thread)d) %(module)s:%(funcName)s: %(message)s (%(pathname)s:%(lineno)d)

[formatter_colored_detailed]
class: coloredlogs.ColoredFormatter
format: %(name)s:%(levelname)s %(threadName)s(%(thread)d) %(module)s:%(funcName)s: %(message)s (%(pathname)s:%(lineno)d)

[handler_console]
class: StreamHandler
args: []
formatter: detailed

[handler_colored_console]
class: StreamHandler
args: []
formatter: colored_detailed

[logger_root]
level: INFO
#handlers: colored_console
handlers: console
propagate: 1

[logger_server]
level: TRACE
handlers:
handlers:
qualname: robotcode.language_server
#propagate: 0

[logger_language_server]
level: TRACE
handlers:
handlers:
qualname: robotcode.language_server.common

[logger_language_server_parts]
level: TRACE
handlers:
handlers:
qualname: robotcode.language_server.common.parts
#propagate: 0

[logger_robotframework]
level: TRACE
handlers:
handlers:
qualname: robotcode.language_server.robotframework
#propagate: 0

[logger_jsonrpc2]
level: TRACE
handlers:
handlers:
qualname: robotcode.jsonrpc2
#propagate: 0

[logger_jsonrpc2_message]
level: INFO
handlers:
handlers:
qualname: robotcode.jsonrpc2.protocol.JsonRPCProtocol.message
propagate: 0

[logger_debugger]
level: TRACE
handlers:
handlers:
qualname: robotcode.debugger

[logger_debugger_launcher]
level: TRACE
handlers:
handlers:
qualname: robotcode.debugger.launcher

[logger_asyncio]
level: TRACE
handlers:
handlers:
qualname: asyncio

[logger_robotcode_utils]
level: TRACE
handlers:
handlers:
qualname: robotcode.utils

[logger_diagnostics]
level: TRACE
handlers:
handlers:
qualname: robotcode.language_server.common.parts.diagnostics

[logger_robot_diagnostics]
level: TRACE
handlers:
handlers:
qualname: robotcode.language_server.robotframework.parts.diagnostics


[logger_robocop_diagnostics]
level: TRACE
handlers:
handlers:
qualname: robotcode.language_server.robotframework.parts.robocop_diagnostics


[logger_document]
level: TRACE
handlers:
handlers:
qualname: robotcode.language_server.common.text_document

[logger_discovering]
level: TRACE
handlers:
handlers:
qualname: robotcode.language_server.robotframework.parts.discovering

63 changes: 17 additions & 46 deletions poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ flake8 = "*"
black = "*"
pep8-naming = "*"
debugpy = "*"
coloredlogs = "*"
GitPython = "^3.1.27"
semantic-version = "^2.9.0"
pre-commit = "^2.17.0"
Expand Down Expand Up @@ -163,7 +162,6 @@ module = [
"robot.*",
"robotremoteserver.*",
"debugpy.*",
"coloredlogs.*",
"robotidy.*",
"robocop.*",
]
Expand Down
14 changes: 1 addition & 13 deletions robotcode/debugger/__main__.py
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,6 @@ def main() -> None:
parser.add_argument("-n", "--no-debug", action="store_true", help="disable debugging")
parser.add_argument("--debug-asyncio", action="store_true", help="enable async io debugging messages")
parser.add_argument("--log-asyncio", action="store_true", help="show asyncio log messages")
parser.add_argument("--log-colored", action="store_true", help="colored output for logs")
parser.add_argument("--log-config", default=None, help="reads logging configuration from file", metavar="FILE")
parser.add_argument("--log-file", default=None, help="enables logging to file", metavar="FILE")
parser.add_argument("--log-level", default="WARNING", help="sets the overall log level", metavar="LEVEL")
Expand Down Expand Up @@ -378,18 +377,7 @@ def main() -> None:
else:
log_level = logging._checkLevel(args.log_level) if args.log else logging.WARNING # type: ignore

log_initialized = False
if args.log_colored:
try:
import coloredlogs

coloredlogs.install(level=log_level)
log_initialized = True
except ImportError:
pass

if not log_initialized:
logging.basicConfig(level=log_level, format="%(name)s:%(levelname)s: %(message)s")
logging.basicConfig(level=log_level, format="%(name)s:%(levelname)s: %(message)s")

if args.log_file is not None:
_logger.logger.addHandler(get_log_handler(args.log_file))
Expand Down
14 changes: 1 addition & 13 deletions robotcode/debugger/launcher/__main__.py
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,6 @@ def main() -> None:
parser.add_argument("--log-debugger-launcher", action="store_true", help="show debugger launcher log messages")
parser.add_argument("--debug-asyncio", action="store_true", help="enable async io debugging messages")
parser.add_argument("--log-asyncio", action="store_true", help="show asyncio log messages")
parser.add_argument("--log-colored", action="store_true", help="colored output for logs")
parser.add_argument("--log-config", default=None, help="reads logging configuration from file", metavar="FILE")
parser.add_argument("--log-file", default=None, help="enables logging to file", metavar="FILE")
parser.add_argument("--log-level", default="WARNING", help="sets the overall log level", metavar="LEVEL")
Expand Down Expand Up @@ -124,18 +123,7 @@ def main() -> None:
else:
log_level = logging._checkLevel(args.log_level) if args.log else logging.WARNING # type: ignore

log_initialized = False
if args.log_colored:
try:
import coloredlogs

coloredlogs.install(level=log_level)
log_initialized = True
except ImportError:
pass

if not log_initialized:
logging.basicConfig(level=log_level, format="%(name)s:%(levelname)s: %(message)s")
logging.basicConfig(level=log_level, format="%(name)s:%(levelname)s: %(message)s")

if args.log_file is not None:
_logger.logger.addHandler(get_log_handler(args.log_file))
Expand Down
Loading

0 comments on commit 82cc095

Please sign in to comment.