Author: solomax
Date: Thu Jan 29 10:00:58 2015
New Revision: 1655572
URL: http://svn.apache.org/r1655572
Log:
Debug output is improved
Modified:
openmeetings/branches/3.0.x/src/util/java/org/apache/openmeetings/util/process/ProcessHelper.java
openmeetings/trunk/singlewebapp/openmeetings-util/src/main/java/org/apache/openmeetings/util/process/ProcessHelper.java
Modified:
openmeetings/branches/3.0.x/src/util/java/org/apache/openmeetings/util/process/ProcessHelper.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/util/java/org/apache/openmeetings/util/process/ProcessHelper.java?rev=1655572&r1=1655571&r2=1655572&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/src/util/java/org/apache/openmeetings/util/process/ProcessHelper.java
(original)
+++
openmeetings/branches/3.0.x/src/util/java/org/apache/openmeetings/util/process/ProcessHelper.java
Thu Jan 29 10:00:58 2015
@@ -92,17 +92,22 @@ public class ProcessHelper {
}
private static String getCommand(String[] argv) {
- String tString = "";
+ StringBuffer tString = new StringBuffer();
for (int i = 0; i < argv.length; i++) {
- tString += argv[i] + " ";
+ tString.append(argv[i]).append(" ");
}
- return tString;
+ return tString.toString();
}
- private static void debugCommand(String desc, String[] argv) {
+ private static void debugCommandStart(String desc, String[] argv) {
if (log.isDebugEnabled()) {
log.debug("START " + desc + " ################# ");
log.debug(getCommand(argv));
+ }
+ }
+
+ private static void debugCommandEnd(String desc) {
+ if (log.isDebugEnabled()) {
log.debug("END " + desc + " ################# ");
}
}
@@ -115,7 +120,7 @@ public class ProcessHelper {
public static ConverterProcessResult executeScript(String process,
String[] argv, Map<? extends String, ? extends String> env) {
ConverterProcessResult returnMap = new ConverterProcessResult();
returnMap.setProcess(process);
- debugCommand(process, argv);
+ debugCommandStart(process, argv);
try {
returnMap.setCommand(getCommand(argv));
@@ -182,6 +187,7 @@ public class ProcessHelper {
returnMap.setExitValue("-1");
}
+ debugCommandEnd(process);
return returnMap;
}
Modified:
openmeetings/trunk/singlewebapp/openmeetings-util/src/main/java/org/apache/openmeetings/util/process/ProcessHelper.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-util/src/main/java/org/apache/openmeetings/util/process/ProcessHelper.java?rev=1655572&r1=1655571&r2=1655572&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-util/src/main/java/org/apache/openmeetings/util/process/ProcessHelper.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-util/src/main/java/org/apache/openmeetings/util/process/ProcessHelper.java
Thu Jan 29 10:00:58 2015
@@ -99,10 +99,15 @@ public class ProcessHelper {
return tString.toString();
}
- private static void debugCommand(String desc, String[] argv) {
+ private static void debugCommandStart(String desc, String[] argv) {
if (log.isDebugEnabled()) {
log.debug("START " + desc + " ################# ");
log.debug(getCommand(argv));
+ }
+ }
+
+ private static void debugCommandEnd(String desc) {
+ if (log.isDebugEnabled()) {
log.debug("END " + desc + " ################# ");
}
}
@@ -115,7 +120,7 @@ public class ProcessHelper {
public static ConverterProcessResult executeScript(String process,
String[] argv, Map<? extends String, ? extends String> env) {
ConverterProcessResult returnMap = new ConverterProcessResult();
returnMap.setProcess(process);
- debugCommand(process, argv);
+ debugCommandStart(process, argv);
try {
returnMap.setCommand(getCommand(argv));
@@ -182,6 +187,7 @@ public class ProcessHelper {
returnMap.setExitValue("-1");
}
+ debugCommandEnd(process);
return returnMap;
}
