--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/common/src/main/java/com/redhat/thermostat/tools/unix/UnixProcessUtilities.java	Thu Apr 05 14:30:19 2012 +0200
@@ -0,0 +1,102 @@
+/*
+ * Copyright 2012 Red Hat, Inc.
+ *
+ * This file is part of Thermostat.
+ *
+ * Thermostat is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published
+ * by the Free Software Foundation; either version 2, or (at your
+ * option) any later version.
+ *
+ * Thermostat is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Thermostat; see the file COPYING.  If not see
+ * <http://www.gnu.org/licenses/>.
+ *
+ * Linking this code with other modules is making a combined work
+ * based on this code.  Thus, the terms and conditions of the GNU
+ * General Public License cover the whole combination.
+ *
+ * As a special exception, the copyright holders of this code give
+ * you permission to link this code with independent modules to
+ * produce an executable, regardless of the license terms of these
+ * independent modules, and to copy and distribute the resulting
+ * executable under terms of your choice, provided that you also
+ * meet, for each linked independent module, the terms and conditions
+ * of the license of that module.  An independent module is a module
+ * which is not derived from or based on this code.  If you modify
+ * this code, you may extend this exception to your version of the
+ * library, but you are not obligated to do so.  If you do not wish
+ * to do so, delete this exception statement from your version.
+ */
+
+package com.redhat.thermostat.tools.unix;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import com.redhat.thermostat.common.utils.LoggedExternalProcess;
+import com.redhat.thermostat.common.utils.LoggingUtils;
+
+public class UnixProcessUtilities {
+
+    private static final Logger logger = LoggingUtils.getLogger(UnixProcessUtilities.class);
+    
+    private static final UnixProcessUtilities instance = new UnixProcessUtilities();
+    public static UnixProcessUtilities getInstance() {
+        return instance;
+    }
+    
+    UnixProcessUtilities() {}
+    
+    /**
+     * Returns the process name of the process with the given pid, or null
+     * if no process is running with the given pid.
+     */
+    public String getProcessName(String pid) {
+        
+        String result = null;
+        
+        List<String> commandLine = new ArrayList<>();
+        commandLine.add("ps");
+        commandLine.add("--no-heading");
+        commandLine.add("-p");
+        commandLine.add(pid);
+        
+        try {
+            Process process = createAndRunProcess(commandLine);
+            BufferedReader reader = getProcessOutput(process);
+            result = reader.readLine();
+            if (result != null) {
+                String [] output = result.split(" ");
+                result = output[output.length - 1];
+            }
+            
+        } catch (IOException e) {
+            logger.log(Level.WARNING, "can't run ps!", e);
+        }
+        
+        return result;
+    }
+    
+    public BufferedReader getProcessOutput(Process process) {
+        InputStream in = process.getInputStream();
+        InputStreamReader isr = new InputStreamReader(in);
+        return new BufferedReader(isr);
+    }
+    
+    public Process createAndRunProcess(List<String> args) throws IOException {
+        LoggedExternalProcess process = new LoggedExternalProcess(args);
+        return process.runAndReturnProcess();
+    }
+}

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/common/src/test/java/com/redhat/thermostat/tools/unix/UnixProcessUtilitiesTest.java	Thu Apr 05 14:30:19 2012 +0200
@@ -0,0 +1,110 @@
+/*
+ * Copyright 2012 Red Hat, Inc.
+ *
+ * This file is part of Thermostat.
+ *
+ * Thermostat is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published
+ * by the Free Software Foundation; either version 2, or (at your
+ * option) any later version.
+ *
+ * Thermostat is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Thermostat; see the file COPYING.  If not see
+ * <http://www.gnu.org/licenses/>.
+ *
+ * Linking this code with other modules is making a combined work
+ * based on this code.  Thus, the terms and conditions of the GNU
+ * General Public License cover the whole combination.
+ *
+ * As a special exception, the copyright holders of this code give
+ * you permission to link this code with independent modules to
+ * produce an executable, regardless of the license terms of these
+ * independent modules, and to copy and distribute the resulting
+ * executable under terms of your choice, provided that you also
+ * meet, for each linked independent module, the terms and conditions
+ * of the license of that module.  An independent module is a module
+ * which is not derived from or based on this code.  If you modify
+ * this code, you may extend this exception to your version of the
+ * library, but you are not obligated to do so.  If you do not wish
+ * to do so, delete this exception statement from your version.
+ */
+
+package com.redhat.thermostat.tools.unix;
+
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.StringReader;
+import java.util.ArrayList;
+import java.util.List;
+
+import junit.framework.Assert;
+
+import org.junit.Before;
+import org.junit.Test;
+
+public class UnixProcessUtilitiesTest {
+
+    private BufferedReader reader;
+    private BufferedReader emptyReader;
+    
+    @Before
+    public void setUp() {
+        
+        String data = "123 fluff";
+        reader = new BufferedReader(new StringReader(data));
+        emptyReader = new BufferedReader(new StringReader(""));
+    }
+    
+    @Test
+    public void getProcessName() {
+
+        final List<String> processArguments = new ArrayList<>();
+        UnixProcessUtilities process = new UnixProcessUtilities() {
+            @Override
+            public Process createAndRunProcess(List<String> args)
+                    throws IOException {
+                processArguments.addAll(args);
+                return null;
+            }
+            
+            public java.io.BufferedReader getProcessOutput(Process process) {
+                return reader;
+            };
+        };
+        
+        String result = process.getProcessName("12345");
+        Assert.assertEquals("fluff", result);
+        Assert.assertTrue(processArguments.contains("12345"));
+        
+        Assert.assertTrue(processArguments.contains("ps"));
+        Assert.assertTrue(processArguments.contains("--no-heading"));
+        Assert.assertTrue(processArguments.contains("-p"));
+    }
+    
+    @Test
+    public void getProcessNameNoOutput() {
+
+        final List<String> processArguments = new ArrayList<>();
+        UnixProcessUtilities process = new UnixProcessUtilities() {
+            @Override
+            public Process createAndRunProcess(List<String> args)
+                    throws IOException {
+                processArguments.addAll(args);
+                return null;
+            }
+            
+            public java.io.BufferedReader getProcessOutput(Process process) {
+                return emptyReader;
+            };
+        };
+        
+        String result = process.getProcessName("12345");
+        Assert.assertNull(result);
+    }    
+}

--- a/tools/src/main/java/com/redhat/thermostat/tools/ThermostatService.java	Thu Apr 05 14:29:15 2012 +0200
+++ b/tools/src/main/java/com/redhat/thermostat/tools/ThermostatService.java	Thu Apr 05 14:30:19 2012 +0200
@@ -113,7 +113,7 @@
         if (actionEvent.getSource().equals(database)) {
             switch (actionEvent.getActionId()) {
             // we are only interested in starting the agent if
-            // we started the service
+            // we started the database ourselves
             case START:
                 String dbUrl = database.getConfiguration().getDBConnectionString();
                 List<String> args = new ArrayList<>();

--- a/tools/src/main/java/com/redhat/thermostat/tools/db/MongoProcessRunner.java	Thu Apr 05 14:29:15 2012 +0200
+++ b/tools/src/main/java/com/redhat/thermostat/tools/db/MongoProcessRunner.java	Thu Apr 05 14:30:19 2012 +0200
@@ -44,14 +44,20 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 import com.redhat.thermostat.common.config.InvalidConfigurationException;
 import com.redhat.thermostat.common.utils.LoggedExternalProcess;
+import com.redhat.thermostat.common.utils.LoggingUtils;
 
 import com.redhat.thermostat.tools.ApplicationException;
+import com.redhat.thermostat.tools.unix.UnixProcessUtilities;
 
 class MongoProcessRunner {
     
+    private static final Logger logger = LoggingUtils.getLogger(MongoProcessRunner.class);
+    
     private static final String [] MONGO_BASIC_ARGS = {
         "mongod", "--quiet", "--fork", "--nojournal", "--noauth", "--bind_ip"
     };
@@ -67,10 +73,11 @@
         this.configuration = configuration;
         this.isQuiet = quiet;
     }
-    
-    private String checkPid() {
+   
+    private String getPid() {
+        
         String pid = null;
-        // check the pid to be sure
+        
         File pidfile = configuration.getPidFile();
         Charset charset = Charset.defaultCharset();
         if (pidfile.exists()) {
@@ -79,8 +86,8 @@
                 if (pid == null || pid.isEmpty()) {
                     pid = null;
                 }
-            } catch (IOException ignore) {
-                ignore.printStackTrace();
+            } catch (IOException ex) {
+                logger.log(Level.WARNING, "Exception while reading pid file", ex);
                 pid = null;
             }
         }
@@ -100,8 +107,7 @@
             display("log file is here: " + configuration.getLogFile());
             
         } else {
-            // TODO: check the pid and see if it's running or not
-            // perhaps was already down
+            
             String message = "cannot shutdown server " + configuration.getDBPath() +
                     ", exit status: " + status +
                     ". Please check that your configuration is valid";
@@ -110,12 +116,29 @@
         }
     }
     
+    private boolean checkExistingProcess() {
+        String pid = getPid();
+        if (pid == null)
+            return false;
+        
+        String processName = UnixProcessUtilities.getInstance().getProcessName(getPid());
+        // TODO: check if we want mongos or mongod from the configs
+        return processName != null && processName.equalsIgnoreCase("mongod");
+    }
+    
     void startService() throws IOException, InterruptedException, ApplicationException {
         
-        String pid = checkPid();
+        String pid = getPid();
         if (pid != null) {
             String message = "cannot start server " + configuration.getDBPath() +
-                    ", found pid file rom previous run, please, cleanup";
+                             ", found pid file from previous run";
+            
+            if (!checkExistingProcess()) {
+                message += ", but no matching process running, please, cleanup";
+            } else {
+                message += ", an instance is running with pid: " + pid;
+            }
+            
             display(message);
             throw new ApplicationException(message);
         }
@@ -146,7 +169,7 @@
         LoggedExternalProcess process = new LoggedExternalProcess(commands);
         int status = process.runAndReturnResult();
         if (status == 0) {
-            pid = checkPid();
+            pid = getPid();
             if (pid == null) status = -1;
         }