Skip to content

Commit 043d7d5

Browse files
kabirkabir
committedFeb 25, 2014
Merge pull request wildfly#5932 from aogburn/EAP6-121
[EAP6-121] Add EAP6-121 upstream but disabled
2 parents 583b351 + 9dc3c84 commit 043d7d5

File tree

3 files changed

+126
-93
lines changed

3 files changed

+126
-93
lines changed
 

‎build/src/main/resources/bin/standalone.bat

+66-48
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,56 @@ if "%DEBUG_MODE%" == "true" (
102102

103103
set DIRNAME=
104104

105+
rem Setup JBoss specific properties
106+
107+
rem Setup directories, note directories with spaces do not work
108+
set "CONSOLIDATED_OPTS=%JAVA_OPTS% %SERVER_OPTS%"
109+
:DIRLOOP
110+
echo(%CONSOLIDATED_OPTS% | findstr /r /c:"^-Djboss.server.base.dir" > nul && (
111+
for /f "tokens=1,2* delims==" %%a IN ("%CONSOLIDATED_OPTS%") DO (
112+
for /f %%i IN ("%%b") DO set "JBOSS_BASE_DIR=%%~fi"
113+
)
114+
)
115+
echo(%CONSOLIDATED_OPTS% | findstr /r /c:"^-Djboss.server.config.dir" > nul && (
116+
for /f "tokens=1,2* delims==" %%a IN ("%CONSOLIDATED_OPTS%") DO (
117+
for /f %%i IN ("%%b") DO set "JBOSS_CONFIG_DIR=%%~fi"
118+
)
119+
)
120+
echo(%CONSOLIDATED_OPTS% | findstr /r /c:"^-Djboss.server.log.dir" > nul && (
121+
for /f "tokens=1,2* delims==" %%a IN ("%CONSOLIDATED_OPTS%") DO (
122+
for /f %%i IN ("%%b") DO set "JBOSS_LOG_DIR=%%~fi"
123+
)
124+
)
125+
126+
for /f "tokens=1* delims= " %%i IN ("%CONSOLIDATED_OPTS%") DO (
127+
if %%i == "" (
128+
goto ENDDIRLOOP
129+
) else (
130+
set CONSOLIDATED_OPTS=%%j
131+
GOTO DIRLOOP
132+
)
133+
)
134+
135+
:ENDDIRLOOP
136+
137+
rem Set default module root paths
138+
if "x%JBOSS_MODULEPATH%" == "x" (
139+
set "JBOSS_MODULEPATH=%JBOSS_HOME%\modules"
140+
)
141+
142+
rem Set the standalone base dir
143+
if "x%JBOSS_BASE_DIR%" == "x" (
144+
set "JBOSS_BASE_DIR=%JBOSS_HOME%\standalone"
145+
)
146+
rem Set the standalone log dir
147+
if "x%JBOSS_LOG_DIR%" == "x" (
148+
set "JBOSS_LOG_DIR=%JBOSS_BASE_DIR%\log"
149+
)
150+
rem Set the standalone configuration dir
151+
if "x%JBOSS_CONFIG_DIR%" == "x" (
152+
set "JBOSS_CONFIG_DIR=%JBOSS_BASE_DIR%\configuration"
153+
)
154+
105155
rem Setup JBoss specific properties
106156
set "JAVA_OPTS=-Dprogram.name=%PROGNAME% %JAVA_OPTS%"
107157

@@ -141,6 +191,22 @@ if not "%PRESERVE_JAVA_OPTS%" == "true" (
141191
)
142192
)
143193

194+
rem EAP6-121 feature disabled
195+
rem if not "%PRESERVE_JAVA_OPTS%" == "true" (
196+
rem Add rotating GC logs, if supported, and not already defined
197+
rem echo "%JAVA_OPTS%" | findstr /I "\-verbose:gc" > nul
198+
rem if errorlevel == 1 (
199+
rem "%JAVA%" -XX:+PrintGCDateStamps -XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=5 -XX:GCLogFileSize=3M -version > nul 2>&1
200+
rem if not errorlevel == 1 (
201+
rem if not exist "%JBOSS_LOG_DIR" > nul 2>&1 (
202+
rem mkdir "%JBOSS_LOG_DIR%"
203+
rem )
204+
rem Back up any prior logs
205+
rem rename "%JBOSS_LOG_DIR%\gc.log.*" "backupgc.log.?"
206+
rem set "JAVA_OPTS=-verbose:gc -Xloggc:%JBOSS_LOG_DIR%\gc.log -XX:+PrintGCDetails -XX:+PrintGCDateStamps -XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=5 -XX:GCLogFileSize=3M %JAVA_OPTS%"
207+
rem )
208+
rem )
209+
rem )
144210

145211
rem Find jboss-modules.jar, or we can't continue
146212
if exist "%JBOSS_HOME%\jboss-modules.jar" (
@@ -151,55 +217,7 @@ if exist "%JBOSS_HOME%\jboss-modules.jar" (
151217
goto END
152218
)
153219

154-
rem Setup JBoss specific properties
155220

156-
rem Setup directories, note directories with spaces do not work
157-
set "CONSOLIDATED_OPTS=%JAVA_OPTS% %SERVER_OPTS%"
158-
:DIRLOOP
159-
echo(%CONSOLIDATED_OPTS% | findstr /r /c:"^-Djboss.server.base.dir" > nul && (
160-
for /f "tokens=1,2* delims==" %%a IN ("%CONSOLIDATED_OPTS%") DO (
161-
for /f %%i IN ("%%b") DO set "JBOSS_BASE_DIR=%%~fi"
162-
)
163-
)
164-
echo(%CONSOLIDATED_OPTS% | findstr /r /c:"^-Djboss.server.config.dir" > nul && (
165-
for /f "tokens=1,2* delims==" %%a IN ("%CONSOLIDATED_OPTS%") DO (
166-
for /f %%i IN ("%%b") DO set "JBOSS_CONFIG_DIR=%%~fi"
167-
)
168-
)
169-
echo(%CONSOLIDATED_OPTS% | findstr /r /c:"^-Djboss.server.log.dir" > nul && (
170-
for /f "tokens=1,2* delims==" %%a IN ("%CONSOLIDATED_OPTS%") DO (
171-
for /f %%i IN ("%%b") DO set "JBOSS_LOG_DIR=%%~fi"
172-
)
173-
)
174-
175-
for /f "tokens=1* delims= " %%i IN ("%CONSOLIDATED_OPTS%") DO (
176-
if %%i == "" (
177-
goto ENDDIRLOOP
178-
) else (
179-
set CONSOLIDATED_OPTS=%%j
180-
GOTO DIRLOOP
181-
)
182-
)
183-
184-
:ENDDIRLOOP
185-
186-
rem Set default module root paths
187-
if "x%JBOSS_MODULEPATH%" == "x" (
188-
set "JBOSS_MODULEPATH=%JBOSS_HOME%\modules"
189-
)
190-
191-
rem Set the standalone base dir
192-
if "x%JBOSS_BASE_DIR%" == "x" (
193-
set "JBOSS_BASE_DIR=%JBOSS_HOME%\standalone"
194-
)
195-
rem Set the standalone log dir
196-
if "x%JBOSS_LOG_DIR%" == "x" (
197-
set "JBOSS_LOG_DIR=%JBOSS_BASE_DIR%\log"
198-
)
199-
rem Set the standalone configuration dir
200-
if "x%JBOSS_CONFIG_DIR%" == "x" (
201-
set "JBOSS_CONFIG_DIR=%JBOSS_BASE_DIR%\configuration"
202-
)
203221

204222
echo ===============================================================================
205223
echo.

‎build/src/main/resources/bin/standalone.sh

+59-45
Original file line numberDiff line numberDiff line change
@@ -117,51 +117,6 @@ if [ "x$JAVA" = "x" ]; then
117117
fi
118118
fi
119119

120-
if [ "$PRESERVE_JAVA_OPTS" != "true" ]; then
121-
# Check for -d32/-d64 in JAVA_OPTS
122-
JVM_D64_OPTION=`echo $JAVA_OPTS | $GREP "\-d64"`
123-
JVM_D32_OPTION=`echo $JAVA_OPTS | $GREP "\-d32"`
124-
125-
# Check If server or client is specified
126-
SERVER_SET=`echo $JAVA_OPTS | $GREP "\-server"`
127-
CLIENT_SET=`echo $JAVA_OPTS | $GREP "\-client"`
128-
129-
if [ "x$JVM_D32_OPTION" != "x" ]; then
130-
JVM_OPTVERSION="-d32"
131-
elif [ "x$JVM_D64_OPTION" != "x" ]; then
132-
JVM_OPTVERSION="-d64"
133-
elif $darwin && [ "x$SERVER_SET" = "x" ]; then
134-
# Use 32-bit on Mac, unless server has been specified or the user opts are incompatible
135-
"$JAVA" -d32 $JAVA_OPTS -version > /dev/null 2>&1 && PREPEND_JAVA_OPTS="-d32" && JVM_OPTVERSION="-d32"
136-
fi
137-
138-
CLIENT_VM=false
139-
if [ "x$CLIENT_SET" != "x" ]; then
140-
CLIENT_VM=true
141-
elif [ "x$SERVER_SET" = "x" ]; then
142-
if $darwin && [ "$JVM_OPTVERSION" = "-d32" ]; then
143-
# Prefer client for Macs, since they are primarily used for development
144-
CLIENT_VM=true
145-
PREPEND_JAVA_OPTS="$PREPEND_JAVA_OPTS -client"
146-
else
147-
PREPEND_JAVA_OPTS="$PREPEND_JAVA_OPTS -server"
148-
fi
149-
fi
150-
151-
if [ $CLIENT_VM = false ]; then
152-
NO_COMPRESSED_OOPS=`echo $JAVA_OPTS | $GREP "\-XX:\-UseCompressedOops"`
153-
if [ "x$NO_COMPRESSED_OOPS" = "x" ]; then
154-
"$JAVA" $JVM_OPTVERSION -server -XX:+UseCompressedOops -version >/dev/null 2>&1 && PREPEND_JAVA_OPTS="$PREPEND_JAVA_OPTS -XX:+UseCompressedOops"
155-
fi
156-
fi
157-
158-
JAVA_OPTS="$PREPEND_JAVA_OPTS $JAVA_OPTS"
159-
fi
160-
161-
if [ "x$JBOSS_MODULEPATH" = "x" ]; then
162-
JBOSS_MODULEPATH="$JBOSS_HOME/modules"
163-
fi
164-
165120
if $linux || $solaris; then
166121
# consolidate the server and command line opts
167122
CONSOLIDATED_OPTS="$JAVA_OPTS $SERVER_OPTS"
@@ -220,6 +175,65 @@ if [ "x$JBOSS_CONFIG_DIR" = "x" ]; then
220175
JBOSS_CONFIG_DIR="$JBOSS_BASE_DIR/configuration"
221176
fi
222177

178+
if [ "$PRESERVE_JAVA_OPTS" != "true" ]; then
179+
# Check for -d32/-d64 in JAVA_OPTS
180+
JVM_D64_OPTION=`echo $JAVA_OPTS | $GREP "\-d64"`
181+
JVM_D32_OPTION=`echo $JAVA_OPTS | $GREP "\-d32"`
182+
183+
# Check If server or client is specified
184+
SERVER_SET=`echo $JAVA_OPTS | $GREP "\-server"`
185+
CLIENT_SET=`echo $JAVA_OPTS | $GREP "\-client"`
186+
187+
if [ "x$JVM_D32_OPTION" != "x" ]; then
188+
JVM_OPTVERSION="-d32"
189+
elif [ "x$JVM_D64_OPTION" != "x" ]; then
190+
JVM_OPTVERSION="-d64"
191+
elif $darwin && [ "x$SERVER_SET" = "x" ]; then
192+
# Use 32-bit on Mac, unless server has been specified or the user opts are incompatible
193+
"$JAVA" -d32 $JAVA_OPTS -version > /dev/null 2>&1 && PREPEND_JAVA_OPTS="-d32" && JVM_OPTVERSION="-d32"
194+
fi
195+
196+
CLIENT_VM=false
197+
if [ "x$CLIENT_SET" != "x" ]; then
198+
CLIENT_VM=true
199+
elif [ "x$SERVER_SET" = "x" ]; then
200+
if $darwin && [ "$JVM_OPTVERSION" = "-d32" ]; then
201+
# Prefer client for Macs, since they are primarily used for development
202+
CLIENT_VM=true
203+
PREPEND_JAVA_OPTS="$PREPEND_JAVA_OPTS -client"
204+
else
205+
PREPEND_JAVA_OPTS="$PREPEND_JAVA_OPTS -server"
206+
fi
207+
fi
208+
209+
if [ $CLIENT_VM = false ]; then
210+
NO_COMPRESSED_OOPS=`echo $JAVA_OPTS | $GREP "\-XX:\-UseCompressedOops"`
211+
if [ "x$NO_COMPRESSED_OOPS" = "x" ]; then
212+
"$JAVA" $JVM_OPTVERSION -server -XX:+UseCompressedOops -version >/dev/null 2>&1 && PREPEND_JAVA_OPTS="$PREPEND_JAVA_OPTS -XX:+UseCompressedOops"
213+
fi
214+
fi
215+
216+
# EAP6-121 feature disabled
217+
# Enable rotating GC logs if the JVM supports it and GC logs are not already enabled
218+
#NO_GC_LOG_ROTATE=`echo $JAVA_OPTS | $GREP "\-verbose:gc"`
219+
#if [ "x$NO_GC_LOG_ROTATE" = "x" ]; then
220+
# backup prior logs
221+
#for file in $JBOSS_LOG_DIR/gc.log.*
222+
#do
223+
#mv "$file" "$JBOSS_LOG_DIR/backupgc.log${file#*/gc.log}" >/dev/null 2>&1
224+
#done
225+
#"$JAVA" $JVM_OPTVERSION -XX:+PrintGCDateStamps -XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=5 -XX:GCLogFileSize=3M -version >/dev/null 2>&1 && mkdir -p $JBOSS_LOG_DIR && PREPEND_JAVA_OPTS="$PREPEND_JAVA_OPTS -verbose:gc -Xloggc:$JBOSS_LOG_DIR/gc.log -XX:+PrintGCDetails -XX:+PrintGCDateStamps -XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=5 -XX:GCLogFileSize=3M"
226+
#fi
227+
228+
JAVA_OPTS="$PREPEND_JAVA_OPTS $JAVA_OPTS"
229+
fi
230+
231+
if [ "x$JBOSS_MODULEPATH" = "x" ]; then
232+
JBOSS_MODULEPATH="$JBOSS_HOME/modules"
233+
fi
234+
235+
236+
223237
# For Cygwin, switch paths to Windows format before running java
224238
if $cygwin; then
225239
JBOSS_HOME=`cygpath --path --windows "$JBOSS_HOME"`

‎jdr/jboss-as-jdr/src/main/java/org/jboss/as/jdr/plugins/AS7Plugin.java

+1
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ public List<JdrCommand> getCommands() throws Exception {
5353
new CollectFiles("*/domain/configuration/*").sanitizer(xmlSanitizer, passwordSanitizer),
5454
new CollectFiles("*server.log").limit(50 * Utils.ONE_MB),
5555
new CollectFiles("*.log").omit("*server.log"),
56+
new CollectFiles("*gc.log.*"),
5657
new CollectFiles("*.properties").sanitizer(passwordSanitizer),
5758
new CollectFiles("*.xml").sanitizer(xmlSanitizer)
5859
);

0 commit comments

Comments
 (0)
Please sign in to comment.