Skip to content

Commit 336590f

Browse files
committed
Log to stderr by default instead of salt-server.log
Output logs to stderr by default instead of salt-server.log, to stop the server from creating log files in the current working directory. Add a "--log-file" flag to support writing logs to a given file instead of stderr. Update SaltServer and SlsFileWorkspace so they use the "--log-level" flag value.
1 parent a258323 commit 336590f

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

salt_lsp/__main__.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,10 @@ def add_arguments(parser):
4343
help="initialize the server, but don't launch it "
4444
"(useful for debugging/testing purposes)",
4545
)
46+
parser.add_argument(
47+
"--log-file",
48+
help="Redirect logs to the given file instead of writing to stderr",
49+
)
4650
parser.add_argument(
4751
"--log-level",
4852
choices=list(LOG_LEVEL_DICT.keys())
@@ -60,7 +64,7 @@ def main():
6064

6165
log_level = loglevel_from_str(args.log_level[0])
6266
logging.basicConfig(
63-
filename="salt-server.log",
67+
filename=args.log_file,
6468
level=log_level,
6569
filemode="w",
6670
)
@@ -72,7 +76,7 @@ def main():
7276

7377
salt_server = SaltServer()
7478
setup_salt_server_capabilities(salt_server)
75-
salt_server.post_init(states, log_level)
79+
salt_server.post_init(states)
7680

7781
if args.stop_after_init:
7882
return

salt_lsp/server.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,14 +59,12 @@ def workspace(self) -> SlsFileWorkspace:
5959
def post_init(
6060
self,
6161
state_name_completions: Dict[str, StateNameCompletion],
62-
log_level=logging.DEBUG,
6362
) -> None:
6463
"""Further initialisation, called after
6564
setup_salt_server_capabilities."""
6665
self._state_name_completions = state_name_completions
6766
self._state_names = list(state_name_completions.keys())
6867
self.logger = logging.getLogger(self.__class__.__name__)
69-
self.logger.setLevel(log_level)
7068

7169
def complete_state_name(
7270
self, params: types.CompletionParams

salt_lsp/workspace.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
contents utilizing the existing Workspace implementation from pygls.
33
44
"""
5-
from logging import getLogger, Logger, DEBUG
5+
from logging import getLogger, Logger
66
from pathlib import Path
77
import sys
88
from typing import List, Optional, Union
@@ -59,8 +59,6 @@ def __init__(
5959
self._state_name_completions = state_name_completions
6060

6161
self.logger: Logger = getLogger(self.__class__.__name__)
62-
# FIXME: make this configurable
63-
self.logger.setLevel(DEBUG)
6462

6563
super().__init__(*args, **kwargs)
6664

0 commit comments

Comments
 (0)