mirror of
https://github.com/dokku/dokku.git
synced 2026-02-24 04:00:36 +01:00
Create dokku's /var/log/dokku/ private namespace
Rename dokku.log to events.log. Refresh tests accordingly.
This commit is contained in:
3
dokku
3
dokku
@@ -10,7 +10,8 @@ export PLUGIN_PATH=${PLUGIN_PATH:="/var/lib/dokku/plugins"}
|
||||
export DOKKU_NOT_IMPLEMENTED_EXIT=10
|
||||
export DOKKU_VALID_EXIT=0
|
||||
|
||||
export DOKKU_EVENTS_LOGFILE=${DOKKU_EVENTS_LOGFILE:="/var/log/dokku.log"}
|
||||
export DOKKU_LOGS_DIR=${DOKKU_LOGS_DIR:="/var/log/dokku"}
|
||||
export DOKKU_EVENTS_LOGFILE=${DOKKU_EVENTS_LOGFILE:="$DOKKU_LOGS_DIR/events.log"}
|
||||
|
||||
source "$PLUGIN_PATH/common/functions"
|
||||
|
||||
|
||||
@@ -7,6 +7,11 @@ DOKKU_LOGROTATE_FILE=/etc/logrotate.d/dokku
|
||||
|
||||
flag_rsyslog_needs_restart=n
|
||||
|
||||
# This can be done unconditionally as mkdir -p
|
||||
# exits gracefully if the path already exists
|
||||
mkdir -m 775 -p "$DOKKU_LOGS_DIR"
|
||||
chown syslog:dokku "$DOKKU_LOGS_DIR"
|
||||
|
||||
if [[ ! -f "$DOKKU_EVENTS_LOGFILE" ]]; then
|
||||
touch "$DOKKU_EVENTS_LOGFILE"
|
||||
# chown syslog:root might not work on SUSE
|
||||
@@ -23,7 +28,7 @@ fi
|
||||
|
||||
if [[ ! -f "$DOKKU_LOGROTATE_FILE" ]]; then
|
||||
cat >"$DOKKU_LOGROTATE_FILE" <<EOF
|
||||
$DOKKU_EVENTS_LOGFILE {
|
||||
$DOKKU_LOGS_DIR/*.log {
|
||||
daily
|
||||
rotate 7
|
||||
missingok
|
||||
|
||||
@@ -19,7 +19,11 @@ teardown() {
|
||||
echo "output: "$output
|
||||
echo "status: "$status
|
||||
assert_success
|
||||
run bash -c "stat -c '%U:%G:%a' /var/log/dokku.log"
|
||||
run bash -c "stat -c '%U:%G:%a' /var/log/dokku/"
|
||||
echo "output: "$output
|
||||
echo "status: "$status
|
||||
assert_output "syslog:dokku:775"
|
||||
run bash -c "stat -c '%U:%G:%a' /var/log/dokku/events.log"
|
||||
echo "output: "$output
|
||||
echo "status: "$status
|
||||
assert_output "syslog:dokku:664"
|
||||
|
||||
Reference in New Issue
Block a user