diff options
| author | Patrick Bajao <ebajao@gitlab.com> | 2021-07-13 06:42:59 +0000 |
|---|---|---|
| committer | Patrick Bajao <ebajao@gitlab.com> | 2021-07-13 06:42:59 +0000 |
| commit | b16c323cc832be3fa3b4bcedcc5a90bfcdc6841a (patch) | |
| tree | 5309aad835ffc6bda82ba0bf468a0ce5e3205a57 | |
| parent | d3a9f19926eec2478dbdfeaf3c130fe26a700e7f (diff) | |
| parent | 4e2a137dee88f34fdfa02c53d126d417a4c76c66 (diff) | |
| download | gitlab-shell-b16c323cc832be3fa3b4bcedcc5a90bfcdc6841a.tar.gz | |
Merge branch 'change_log_format' into 'main'
Change default logging format to JSON
See merge request gitlab-org/gitlab-shell!476
| -rw-r--r-- | config.yml.example | 4 | ||||
| -rw-r--r-- | internal/config/config.go | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/config.yml.example b/config.yml.example index 1dc2c5e..5662d2e 100644 --- a/config.yml.example +++ b/config.yml.example @@ -50,7 +50,7 @@ auth_file: "/home/git/.ssh/authorized_keys" # Log level. INFO by default log_level: INFO -# Log format. 'text' by default +# Log format. 'json' by default, can be changed to 'text' if needed # log_format: json # Audit usernames. @@ -73,7 +73,7 @@ sshd: web_listen: "localhost:9122" # Maximum number of concurrent sessions allowed on a single SSH connection. Defaults to 10. concurrent_sessions_limit: 10 - # SSH host key files. + # SSH host key files. host_key_files: - /run/secrets/ssh-hostkeys/ssh_host_rsa_key - /run/secrets/ssh-hostkeys/ssh_host_ecdsa_key diff --git a/internal/config/config.go b/internal/config/config.go index c112038..23044cd 100644 --- a/internal/config/config.go +++ b/internal/config/config.go @@ -60,7 +60,7 @@ type Config struct { var ( DefaultConfig = Config{ LogFile: "gitlab-shell.log", - LogFormat: "text", + LogFormat: "json", Server: DefaultServerConfig, User: "git", } |