[GitHub] DaanHoogland commented on a change in pull request #3030: correct permissions in spec file and fix class path specified variable

2018-11-20 Thread GitBox 
DaanHoogland commented on a change in pull request #3030: correct permissions 
in spec file and fix class path specified variable
URL: https://github.com/apache/cloudstack/pull/3030#discussion_r234918177
 
 

 ##
 File path: packaging/systemd/cloudstack-management.service
 ##
 @@ -28,8 +28,8 @@ Environment="NAME=cloudstack-management"
 EnvironmentFile=/etc/default/cloudstack-management
 ExecStartPre=/bin/bash -c "/bin/systemctl set-environment JAVA_HOME=$( 
readlink -f $( which java ) | sed s:bin/.*$:: )"
 ExecStartPre=/bin/bash -c "/bin/systemctl set-environment JARS=$(ls 
/usr/share/cloudstack-management/lib/*.jar | tr '\n' ':' | sed s'/.$//')"
-ExecStart=/usr/bin/jsvc -home "${JAVA_HOME}" -user "${CLOUDSTACK_USER}" -cp 
"${JARS}:${CLASSPATH}" -errfile ${LOGDIR}/${NAME}.err -cwd ${LOGDIR} -pidfile 
"${CLOUDSTACK_PID}" ${JAVA_OPTS} "${BOOTSTRAP_CLASS}"
-ExecStop=/usr/bin/jsvc -cp "$JARS:$CLASSPATH" -pidfile "$CLOUDSTACK_PID" -stop 
"$BOOTSTRAP_CLASS"
+ExecStart=/usr/bin/jsvc "${JAVA_DEBUG}" -home "${JAVA_HOME}" -user 
"${CLOUDSTACK_USER}" -cp "${JARS}:${CLASSPATH}" -errfile 
"${LOGDIR}/${NAME}.err" -cwd "${LOGDIR}" -pidfile "${CLOUDSTACK_PID}" 
"${JAVA_OPTS}" "${BOOTSTRAP_CLASS}"
 
 Review comment:
   manually testing revealed that the double quotes around ${JAVA_DEBUG} 
prevent the service from starting. without them it starts. This is probably due 
to the contents being empty resulting in an empty argument instead of none 
(guess).


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[GitHub] DaanHoogland commented on a change in pull request #3030: correct permissions in spec file and fix class path specified variable

2018-11-19 Thread GitBox 
DaanHoogland commented on a change in pull request #3030: correct permissions 
in spec file and fix class path specified variable
URL: https://github.com/apache/cloudstack/pull/3030#discussion_r234603576
 
 

 ##
 File path: packaging/systemd/cloudstack-management.service
 ##
 @@ -28,8 +28,13 @@ Environment="NAME=cloudstack-management"
 EnvironmentFile=/etc/default/cloudstack-management
 ExecStartPre=/bin/bash -c "/bin/systemctl set-environment JAVA_HOME=$( 
readlink -f $( which java ) | sed s:bin/.*$:: )"
 ExecStartPre=/bin/bash -c "/bin/systemctl set-environment JARS=$(ls 
/usr/share/cloudstack-management/lib/*.jar | tr '\n' ':' | sed s'/.$//')"
+<<< HEAD
 ExecStart=/usr/bin/jsvc -home "${JAVA_HOME}" -user "${CLOUDSTACK_USER}" -cp 
"${JARS}:${CLASSPATH}" -errfile ${LOGDIR}/${NAME}.err -cwd ${LOGDIR} -pidfile 
"${CLOUDSTACK_PID}" ${JAVA_OPTS} "${BOOTSTRAP_CLASS}"
 ExecStop=/usr/bin/jsvc -cp "$JARS:$CLASSPATH" -pidfile "$CLOUDSTACK_PID" -stop 
"$BOOTSTRAP_CLASS"
+===
 
 Review comment:
   looks good now.


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services

[GitHub] DaanHoogland commented on a change in pull request #3030: correct permissions in spec file and fix class path specified variable

2018-11-19 Thread GitBox 
DaanHoogland commented on a change in pull request #3030: correct permissions 
in spec file and fix class path specified variable
URL: https://github.com/apache/cloudstack/pull/3030#discussion_r234531916
 
 

 ##
 File path: packaging/systemd/cloudstack-management.service
 ##
 @@ -28,8 +28,13 @@ Environment="NAME=cloudstack-management"
 EnvironmentFile=/etc/default/cloudstack-management
 ExecStartPre=/bin/bash -c "/bin/systemctl set-environment JAVA_HOME=$( 
readlink -f $( which java ) | sed s:bin/.*$:: )"
 ExecStartPre=/bin/bash -c "/bin/systemctl set-environment JARS=$(ls 
/usr/share/cloudstack-management/lib/*.jar | tr '\n' ':' | sed s'/.$//')"
+<<< HEAD
 ExecStart=/usr/bin/jsvc -home "${JAVA_HOME}" -user "${CLOUDSTACK_USER}" -cp 
"${JARS}:${CLASSPATH}" -errfile ${LOGDIR}/${NAME}.err -cwd ${LOGDIR} -pidfile 
"${CLOUDSTACK_PID}" ${JAVA_OPTS} "${BOOTSTRAP_CLASS}"
 ExecStop=/usr/bin/jsvc -cp "$JARS:$CLASSPATH" -pidfile "$CLOUDSTACK_PID" -stop 
"$BOOTSTRAP_CLASS"
+===
 
 Review comment:
   this is a git artifact, @svenvogel . It should not show here, so something 
went wrong :(


This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


With regards,
Apache Git Services