Add global logging configuration

This commit is contained in:
Samuel Sieg
2023-03-19 09:21:08 +01:00
parent d167e48584
commit b5372988f7
11 changed files with 83 additions and 41 deletions

View File

@@ -12,8 +12,8 @@ class Mrsk::Commands::Accessory < Mrsk::Commands::Base
"--name", service_name,
"--detach",
"--restart", "unless-stopped",
"--log-opt", "max-size=#{MAX_LOG_SIZE}",
"--publish", port,
*config.logging_args,
*env_args,
*volume_args,
*label_args,

View File

@@ -5,10 +5,10 @@ class Mrsk::Commands::App < Mrsk::Commands::Base
docker :run,
"--detach",
"--restart unless-stopped",
"--log-opt", "max-size=#{MAX_LOG_SIZE}",
"--name", service_with_version_and_destination,
"-e", "MRSK_CONTAINER_NAME=\"#{service_with_version_and_destination}\"",
*role.env_args,
*config.logging_args,
*config.volume_args,
*role.label_args,
*role.option_args,

View File

@@ -2,8 +2,6 @@ module Mrsk::Commands
class Base
delegate :redact, to: Mrsk::Utils
MAX_LOG_SIZE = "10m"
attr_accessor :config
def initialize(config)

View File

@@ -7,9 +7,9 @@ class Mrsk::Commands::Traefik < Mrsk::Commands::Base
docker :run, "--name traefik",
"--detach",
"--restart", "unless-stopped",
"--log-opt", "max-size=#{MAX_LOG_SIZE}",
"--publish", port,
"--volume", "/var/run/docker.sock:/var/run/docker.sock",
*config.logging_args,
"traefik",
"--providers.docker",
"--log.level=DEBUG",

View File

@@ -6,7 +6,7 @@ require "erb"
require "net/ssh/proxy/jump"
class Mrsk::Configuration
delegate :service, :image, :servers, :env, :labels, :registry, :builder, to: :raw_config, allow_nil: true
delegate :service, :image, :servers, :env, :labels, :registry, :builder, :logging, to: :raw_config, allow_nil: true
delegate :argumentize, :argumentize_env_with_secrets, to: Mrsk::Utils
attr_accessor :version
@@ -109,6 +109,15 @@ class Mrsk::Configuration
end
end
def logging_args
if raw_config.logging.present?
[ "--log-driver", raw_config.logging["driver"] || "json-file" ] +
argumentize("--log-opt", raw_config.logging["options"])
else
[]
end
end
def ssh_user
if raw_config.ssh.present?
@@ -161,6 +170,7 @@ class Mrsk::Configuration
ssh_options: ssh_options,
builder: raw_config.builder,
accessories: raw_config.accessories,
logging: raw_config.logging,
healthcheck: healthcheck
}.compact
end