apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

ProcessUtil cleanup

Browse Source 
- possible resource leak closed
- file content read uses now commons-lang FileUtils
- Added unit tests
This commit is contained in:
Laszlo Hornyak 2013-06-18 22:09:05 +02:00 committed by frank
parent 35ab598d1f
commit f081092b80
2 changed files with 63 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
utils/src/com/cloud/utils/ProcessUtil.java
View File

@ -16,24 +16,20 @@
// under the License.
package com.cloud.utils;
import java.io.BufferedReader;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStreamReader;
import java.util.Properties;
import javax.naming.ConfigurationException;
import org.apache.commons.io.FileUtils;
import org.apache.log4j.Logger;
import com.cloud.utils.PropertiesUtil;
import com.cloud.utils.exception.CloudRuntimeException;
import com.cloud.utils.script.OutputInterpreter;
import com.cloud.utils.script.Script;
import java.util.Properties;
public class ProcessUtil {
private static final Logger s_logger = Logger.getLogger(ProcessUtil.class.getName());
@ -67,11 +63,9 @@ public class ProcessUtil {
if (!pidFile.exists()) {
throw new ConfigurationException("Unable to write to " + pidFile.getAbsolutePath() + ". Are you sure you're running as root?");
}
final FileInputStream is = new FileInputStream(pidFile);
final BufferedReader reader = new BufferedReader(new InputStreamReader(is));
final String pidLine = reader.readLine();
if (pidLine == null) {
final String pidLine = FileUtils.readFileToString(pidFile).trim();
if (pidLine.isEmpty()) {
throw new ConfigurationException("Java process is being started twice. If this is not true, remove " + pidFile.getAbsolutePath());
}
try {
@ -101,9 +95,7 @@ public class ProcessUtil {
final String pid = parser.getLine();
final FileOutputStream strm = new FileOutputStream(pidFile);
strm.write((pid + "\n").getBytes());
strm.close();
FileUtils.writeStringToFile(pidFile, pid + "\n");
} catch (final IOException e) {
throw new CloudRuntimeException("Unable to create the " + pidFile.getAbsolutePath() + ". Are you running as root?", e);
}

57
utils/test/com/cloud/utils/ProcessUtilTest.java Normal file
View File

@ -0,0 +1,57 @@
package com.cloud.utils;
import java.io.File;
import java.io.IOException;
import javax.naming.ConfigurationException;
import junit.framework.Assert;
import org.apache.commons.io.FileUtils;
import org.apache.commons.lang.SystemUtils;
import org.junit.After;
import org.junit.Assume;
import org.junit.Before;
import org.junit.Test;
public class ProcessUtilTest {
File pidFile;
@Before
public void setup() throws IOException {
pidFile = File.createTempFile("test", ".pid");
}
@After
public void cleanup() {
FileUtils.deleteQuietly(pidFile);
}
@Test
public void pidCheck() throws ConfigurationException, IOException {
Assume.assumeTrue(SystemUtils.IS_OS_LINUX);
FileUtils.writeStringToFile(pidFile, "123456\n");
ProcessUtil.pidCheck(pidFile.getParent(), pidFile.getName());
String pidStr = FileUtils.readFileToString(pidFile);
Assert.assertFalse("pid can not be blank", pidStr.isEmpty());
int pid = Integer.parseInt(pidStr.trim());
int maxPid = Integer.parseInt(FileUtils.readFileToString(new File("/proc/sys/kernel/pid_max")).trim());
Assert.assertTrue(pid <= maxPid);
}
@Test(expected = ConfigurationException.class)
public void pidCheckBadPid() throws ConfigurationException, IOException {
Assume.assumeTrue(SystemUtils.IS_OS_LINUX);
FileUtils.writeStringToFile(pidFile, "intentionally not number");
ProcessUtil.pidCheck(pidFile.getParent(), pidFile.getName());
}
@Test(expected = ConfigurationException.class)
public void pidCheckEmptyPid() throws ConfigurationException, IOException {
Assume.assumeTrue(SystemUtils.IS_OS_LINUX);
FileUtils.writeStringToFile(pidFile, "intentionally not number");
ProcessUtil.pidCheck(pidFile.getParent(), pidFile.getName());
}
}