Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Do not log into zowe.runtimeDirectory #726

Merged
merged 5 commits into from
Aug 28, 2024
Merged

Do not log into zowe.runtimeDirectory #726

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7527fa7
Do not log into zowe.runtimeDirectory
Martin-Zeithaml Aug 20, 2024
2431282
If no log dir, disable logging in prod
Martin-Zeithaml Aug 23, 2024
3ef0e05
Minor update
Martin-Zeithaml Aug 23, 2024
2cd75d0
Do not create empty dir
Martin-Zeithaml Aug 23, 2024
b55b510
Update start.sh
Martin-Zeithaml Aug 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
All notable changes to the ZSS package will be documented in this file.

## `3.0.0`

- Enhancement: if no `zowe.logDirectory` is defined in config, logging is disabled. (#726)

## `2.18.0`
- Change log level for setting default value of 'httpRequestHeapMaxBlocks' to DEBUG instead of INFO.(#719)
Expand Down
21 changes: 14 additions & 7 deletions bin/start.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,20 +74,27 @@ if [[ "${OSNAME}" == "OS/390" ]]; then
then
ZWES_LOG_DIR=${ZWE_zowe_logDirectory}
else
ZWES_LOG_DIR="../log"
if [ -z "${ZWE_zowe_runtimeDirectory}" ]; then
ZWES_LOG_DIR="../log"
else
echo "No log directory. Logging disabled."
ZWES_LOG_DIR=
ZWES_LOG_FILE=/dev/null
fi
fi
fi
if [ -f "$ZWES_LOG_DIR" ]
then
ZWES_LOG_FILE=$ZWES_LOG_DIR
elif [ ! -d "$ZWES_LOG_DIR" ]
then
echo "Will make log directory $ZWES_LOG_DIR"
mkdir -p $ZWES_LOG_DIR
if [ $? -ne 0 ]
then
echo "Cannot make log directory. Logging disabled."
ZWES_LOG_FILE=/dev/null
if [ -n "${ZWES_LOG_DIR}" ]; then
echo "Will make log directory $ZWES_LOG_DIR"
mkdir -p $ZWES_LOG_DIR
if [ $? -ne 0 ]; then
echo "Cannot make log directory. Logging disabled."
ZWES_LOG_FILE=/dev/null
fi
fi
fi
ZWES_ROTATE_LOGS=0
Expand Down
Loading