Skip to content

Commit

Permalink
W-14979997: create log directory, add hostname
Browse files Browse the repository at this point in the history
  • Loading branch information
pdmoineau committed May 22, 2024
1 parent ced67e4 commit 70e95a1
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 9 deletions.
2 changes: 1 addition & 1 deletion carbonj.service/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ ARG VERSION=latest
# Ensure crontab starts
# Add Tini for proper sigkill handling https://github.com/krallin/tini
RUN yum update -y && \
yum install -y libevent perl wget util-linux-ng cronie procps nc lsof && \
yum install -y libevent perl wget util-linux-ng cronie procps nc lsof hostname && \
yum install -y gcc-c++ gcc make libtool automake autoconf make python3-devel && \
rpm --import http://repos.azulsystems.com/RPM-GPG-KEY-azulsystems && \
yum install -y https://cdn.azul.com/zulu/bin/zulu-repo-1.0.0-1.noarch.rpm && \
Expand Down
18 changes: 10 additions & 8 deletions carbonj.service/src/main/docker/files/entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -36,14 +36,16 @@ if [ -d /data ]; then
mkdir $SERVICEDIR/work/carbonj-data
mkdir $SERVICEDIR/work/carbonj-tmp
mkdir $SERVICEDIR/work/carbonj-staging
if [ "${ROCKSDB_READONLY}" == "false" ]; then
mkdir $SERVICEDIR/work/log
ln -s $SERVICEDIR/work/log $SERVICEDIR/log
else
mkdir $SERVICEDIR/work/log-readonly
ln -s $SERVICEDIR/work/log-readonly $SERVICEDIR/log
YOURKIT_PROFILER_AGENT_PORT=20002
fi
fi

# Add log directory
if [ "${ROCKSDB_READONLY}" == "true" ]; then
mkdir -p $SERVICEDIR/work/log-readonly
ln -s $SERVICEDIR/work/log-readonly $SERVICEDIR/log
YOURKIT_PROFILER_AGENT_PORT=20002
else
mkdir -p $SERVICEDIR/work/log
ln -s $SERVICEDIR/work/log $SERVICEDIR/log
fi

#set default spring profile if none is given. exclusively used for properties overrides file
Expand Down

0 comments on commit 70e95a1

Please sign in to comment.