Menu
▾
▴
[Wrapper-cvs] SF.net SVN: wrapper:[1933] trunk/wrapper
|
From: <mor...@us...> - 2015-08-20 02:54:05
|
Revision: 1933
http://sourceforge.net/p/wrapper/code/1933
Author: mortenson
Date: 2015-08-20 02:54:03 +0000 (Thu, 20 Aug 2015)
Log Message:
-----------
Work on 3.5.27 release.
Modified Paths:
--------------
trunk/wrapper/build.xml
trunk/wrapper/doc/revisions.txt
trunk/wrapper/src/bin/sh.script.in
trunk/wrapper/src/c/wrapper.c
trunk/wrapper/src/c/wrapper_file.c
Modified: trunk/wrapper/build.xml
===================================================================
--- trunk/wrapper/build.xml 2015-08-19 04:42:06 UTC (rev 1932)
+++ trunk/wrapper/build.xml 2015-08-20 02:54:03 UTC (rev 1933)
@@ -1853,8 +1853,8 @@
</sequential>
</macrodef>
<target name="release-delta:extract-platforms">
- <release-delta-extract-platform osname="aix" osarch="ppc" bits="32" wrapperbinhead="wrapper" wrapperbintail="" wrapperlibhead="libwrapper" wrapperlibtail=".a" archivetype="tar.gz"/>
- <release-delta-extract-platform osname="aix" osarch="ppc" bits="64" wrapperbinhead="wrapper" wrapperbintail="" wrapperlibhead="libwrapper" wrapperlibtail=".a" archivetype="tar.gz"/>
+ <release-delta-extract-platform osname="aix" osarch="ppc" bits="32" wrapperbinhead="wrapper" wrapperbintail="" wrapperlibhead="libwrapper" wrapperlibtail=".so" archivetype="tar.gz"/>
+ <release-delta-extract-platform osname="aix" osarch="ppc" bits="64" wrapperbinhead="wrapper" wrapperbintail="" wrapperlibhead="libwrapper" wrapperlibtail=".so" archivetype="tar.gz"/>
<release-delta-extract-platform osname="freebsd" osarch="x86" bits="32" wrapperbinhead="wrapper" wrapperbintail="" wrapperlibhead="libwrapper" wrapperlibtail=".so" archivetype="tar.gz"/>
<release-delta-extract-platform osname="freebsd" osarch="x86" bits="64" wrapperbinhead="wrapper" wrapperbintail="" wrapperlibhead="libwrapper" wrapperlibtail=".so" archivetype="tar.gz"/>
<release-delta-extract-platform osname="hpux" osarch="ia" bits="32" wrapperbinhead="wrapper" wrapperbintail="" wrapperlibhead="libwrapper" wrapperlibtail=".so" archivetype="tar.gz"/>
Modified: trunk/wrapper/doc/revisions.txt
===================================================================
--- trunk/wrapper/doc/revisions.txt 2015-08-19 04:42:06 UTC (rev 1932)
+++ trunk/wrapper/doc/revisions.txt 2015-08-20 02:54:03 UTC (rev 1933)
@@ -57,8 +57,9 @@
* Fix a problem on HP-UX when listing HostIds. If several HostIds were
available on the machine, the wrapper could only get the first one and
reported DLPI errors when attempting to get the others.
+* Fix path to remove files when uninstalling the Wrapper daemon process on
+ HPUX.
-
3.5.26
* Improve the log messages when a JVM restart is requested when the Wrapper is
in a state that it will be ignored.
Modified: trunk/wrapper/src/bin/sh.script.in
===================================================================
--- trunk/wrapper/src/bin/sh.script.in 2015-08-19 04:42:06 UTC (rev 1932)
+++ trunk/wrapper/src/bin/sh.script.in 2015-08-20 02:54:03 UTC (rev 1933)
@@ -1464,7 +1464,7 @@
else
eval echo `gettext ' Installing the $APP_LONG_NAME daemon..'`
ln -s "$REALPATH" "/sbin/init.d/$APP_NAME"
- for i in `ls "/etc/rc3.d/K"??"$APP_NAME_LOWER" "/etc/rc3.d/S"??"$APP_NAME_LOWER" 2>/dev/null` ; do
+ for i in `ls "/sbin/rc3.d/K"??"$APP_NAME_LOWER" "/sbin/rc3.d/S"??"$APP_NAME_LOWER" 2>/dev/null` ; do
eval echo `gettext ' Removing unexpected file before proceeding: $i'`
rm -f $i
done
@@ -1666,7 +1666,7 @@
if [ -f "/sbin/init.d/$APP_NAME" -o -L "/sbin/init.d/$APP_NAME" ] ; then
stopit "0"
eval echo `gettext ' Removing $APP_LONG_NAME daemon...'`
- for i in `ls "/etc/rc3.d/K"??"$APP_NAME_LOWER" "/etc/rc3.d/S"??"$APP_NAME_LOWER" "/etc/init.d/$APP_NAME" 2>/dev/null` ; do
+ for i in `ls "/sbin/rc3.d/K"??"$APP_NAME_LOWER" "/sbin/rc3.d/S"??"$APP_NAME_LOWER" "/sbin/init.d/$APP_NAME" 2>/dev/null` ; do
rm -f $i
done
else
Modified: trunk/wrapper/src/c/wrapper.c
===================================================================
--- trunk/wrapper/src/c/wrapper.c 2015-08-19 04:42:06 UTC (rev 1932)
+++ trunk/wrapper/src/c/wrapper.c 2015-08-20 02:54:03 UTC (rev 1933)
@@ -4947,7 +4947,7 @@
* If the the user specifically wants the environment, show it as the status log level, otherwise include it in debug output if enabled. */
if (getBooleanProperty(properties, TEXT("wrapper.environment.dump"), FALSE)) {
dumpEnvironment(LEVEL_INFO);
- } else if (getBooleanProperty(properties, TEXT("wrapper.debug"), FALSE)) {
+ } else if (wrapperData->isDebugging) {
dumpEnvironment(LEVEL_DEBUG);
}
Modified: trunk/wrapper/src/c/wrapper_file.c
===================================================================
--- trunk/wrapper/src/c/wrapper_file.c 2015-08-19 04:42:06 UTC (rev 1932)
+++ trunk/wrapper/src/c/wrapper_file.c 2015-08-20 02:54:03 UTC (rev 1933)
@@ -506,7 +506,16 @@
} else if (!reader->preload && _tcsstr(trimmedBuffer, TEXT("#properties.")) == trimmedBuffer) {
if(_tcsstr(trimmedBuffer, TEXT("#properties.on_overwrite.exit=")) == trimmedBuffer) {
trimmedBuffer += 30;
- reader->exitOnOverwrite = (_tcsicmp(trimmedBuffer, TEXT("TRUE")) == 0);
+ if (_tcsicmp(trimmedBuffer, TEXT("TRUE")) == 0) {
+ reader->exitOnOverwrite = TRUE;
+ } else {
+ reader->exitOnOverwrite = FALSE;
+ if (_tcsicmp(trimmedBuffer, TEXT("FALSE")) != 0) {
+ log_printf(WRAPPER_SOURCE_WRAPPER, LEVEL_WARN,
+ TEXT("Encountered an invalid boolean value for directive #properties.on_overwrite.exit=%s (line %d). Resolving to FALSE."),
+ trimmedBuffer, lineNumber);
+ }
+ }
} else if (_tcsstr(trimmedBuffer, TEXT("#properties.on_overwrite.loglevel=")) == trimmedBuffer) {
trimmedBuffer += 34;
logLevelOnOverwrite = getLogLevelForName(trimmedBuffer);
@@ -517,7 +526,7 @@
reader->logLevelOnOverwrite = logLevelOnOverwrite;
} else {
log_printf(WRAPPER_SOURCE_WRAPPER, LEVEL_WARN,
- TEXT("Encountered an invalid value for directive #properties.on_overwrite.loglevel=%s (line %d)\n Ignoring this directive."),
+ TEXT("Encountered an invalid value for directive #properties.on_overwrite.loglevel=%s (line %d). Ignoring this directive."),
trimmedBuffer, lineNumber);
}
} else if (strcmpIgnoreCase(trimmedBuffer, TEXT("#properties.debug")) == 0) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|