Protei/PromucFlow_constructor
2
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

chore: Use tlog instead of echo in more places (#34182)

Browse Source 
**/test sanity**



<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->

## Summary by CodeRabbit

- **Refactor**
- Updated logging mechanism from `echo` to `tlog` for improved log
management across various scripts.
  
- **Chores**
- Enhanced logging for better clarity and consistency in deployment
scripts.

<!-- end of auto-generated comment: release notes by coderabbit.ai -->
This commit is contained in:
Shrikant Sharat Kandula 2024-06-11 20:10:33 +05:30 committed by GitHub
parent cdee74e93b
commit 4dba047942
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deploy/docker/fs/opt/appsmith/entrypoint.sh
View File

@ -51,7 +51,7 @@ init_env_file() {
tlog "Initialize .env file" tlog "Initialize .env file"
if ! [[ -e "$ENV_PATH" ]]; then if ! [[ -e "$ENV_PATH" ]]; then
# Generate new docker.env file when initializing container for first time or in Heroku which does not have persistent volume # Generate new docker.env file when initializing container for first time or in Heroku which does not have persistent volume
echo "Generating default configuration file" tlog "Generating default configuration file"
mkdir -p "$CONF_PATH" mkdir -p "$CONF_PATH"
local default_appsmith_mongodb_user="appsmith" local default_appsmith_mongodb_user="appsmith"
local generated_appsmith_mongodb_password=$( local generated_appsmith_mongodb_password=$(

8
deploy/docker/fs/opt/appsmith/mongodb-fixer.sh
View File

@ -8,24 +8,24 @@ set -o nounset
while [[ ! -S "$TMP/supervisor.sock" ]]; do while [[ ! -S "$TMP/supervisor.sock" ]]; do
sleep 1 sleep 1
done done
echo "supervisor.sock found" tlog "supervisor.sock found"
while supervisorctl status mongodb | grep -q RUNNING; do while supervisorctl status mongodb | grep -q RUNNING; do
sleep 1 sleep 1
done done
echo "MongoDB is RUNNING" tlog "MongoDB is RUNNING"
for _ in {1..60}; do for _ in {1..60}; do
if mongosh --quiet "$APPSMITH_DB_URL" --eval ' if mongosh --quiet "$APPSMITH_DB_URL" --eval '
parseFloat(db.adminCommand({getParameter: 1, featureCompatibilityVersion: 1}).featureCompatibilityVersion.version) < 5 && parseFloat(db.adminCommand({getParameter: 1, featureCompatibilityVersion: 1}).featureCompatibilityVersion.version) < 5 &&
db.adminCommand({setFeatureCompatibilityVersion: "5.0"}) db.adminCommand({setFeatureCompatibilityVersion: "5.0"})
'; then '; then
echo "MongoDB version set to 5.0" tlog "MongoDB version set to 5.0"
break break
fi fi
sleep 1 sleep 1
done done
echo Done tlog Done
} | sed -u 's/^/mongodb-fixer: /' } | sed -u 's/^/mongodb-fixer: /'

4
deploy/docker/fs/opt/appsmith/run-java.sh
View File

@ -59,10 +59,10 @@ fi
# Wait until RTS started and listens on port 8091 # Wait until RTS started and listens on port 8091
while ! curl --fail --silent localhost:"${APPSMITH_RTS_PORT:-8091}"/rts-api/v1/health-check; do while ! curl --fail --silent localhost:"${APPSMITH_RTS_PORT:-8091}"/rts-api/v1/health-check; do
echo 'Waiting for RTS to start ...' tlog 'Waiting for RTS to start ...'
sleep 1 sleep 1
done done
echo 'RTS started.' tlog 'RTS started.'
sh /opt/appsmith/run-starting-page-init.sh & sh /opt/appsmith/run-starting-page-init.sh &

4
deploy/docker/fs/opt/appsmith/run-with-env.sh
View File

@ -2,7 +2,7 @@
ENV_PATH="/appsmith-stacks/configuration/docker.env" ENV_PATH="/appsmith-stacks/configuration/docker.env"
PRE_DEFINED_ENV_PATH="$TMP/pre-define.env" PRE_DEFINED_ENV_PATH="$TMP/pre-define.env"
echo 'Load environment configuration' tlog 'Load environment configuration'
set -o allexport set -o allexport
. "$ENV_PATH" . "$ENV_PATH"
. "$PRE_DEFINED_ENV_PATH" . "$PRE_DEFINED_ENV_PATH"
@ -31,7 +31,7 @@ fi
if [[ -z "${APPSMITH_GIT_ROOT:-}" ]]; then if [[ -z "${APPSMITH_GIT_ROOT:-}" ]]; then
export APPSMITH_GIT_ROOT=/appsmith-stacks/git-storage export APPSMITH_GIT_ROOT=/appsmith-stacks/git-storage
else else
echo "WARNING: It appears a custom value has been configured for APPSMITH_GIT_ROOT. This behaviour is deprecated and will soon be removed." tlog "WARNING: It appears a custom value has been configured for APPSMITH_GIT_ROOT. This behaviour is deprecated and will soon be removed." >&2
fi fi
mkdir -pv "$APPSMITH_GIT_ROOT" mkdir -pv "$APPSMITH_GIT_ROOT"