net.dns: More reliable parsing of resolv.conf - allow multiple nameserver IPs on...

[prosody.git] / util / prosodyctl.lua

diff --git a/util/prosodyctl.lua b/util/prosodyctl.lua
index 3b523a786bd419800b9d261c05fcdf316f5baec6..0776fc76e825f44b7f53015c067e5c966d502eb5 100644 (file)
--- a/util/prosodyctl.lua
+++ b/util/prosodyctl.lua
@@ -1,14 +1,26 @@
+-- Prosody IM
+-- Copyright (C) 2008-2009 Matthew Wild
+-- Copyright (C) 2008-2009 Waqas Hussain
+-- 
+-- This project is MIT/X11 licensed. Please see the
+-- COPYING file in the source package for more information.
+--
+
 
 local config = require "core.configmanager";
 local encodings = require "util.encodings";
 local stringprep = encodings.stringprep;
 local usermanager = require "core.usermanager";
 local signal = require "util.signal";
+local lfs = require "lfs";
 
 local nodeprep, nameprep = stringprep.nodeprep, stringprep.nameprep;
 
 local io, os = io, os;
 local tostring, tonumber = tostring, tonumber;
+
+local CFG_SOURCEDIR = _G.CFG_SOURCEDIR;
+
 module "prosodyctl"
 
 function adduser(params)
@@ -53,9 +65,15 @@ function getpid()
                return false, "no-pidfile";
        end
        
-       local file, err = io.open(pidfile);
+       local file, err = io.open(pidfile, "r+");
        if not file then
-               return false, "pidfile-read-failed", ret;
+               return false, "pidfile-read-failed", err;
+       end
+       
+       local locked, err = lfs.lock(file, "w");
+       if locked then
+               file:close();
+               return false, "pidfile-not-locked";
        end
        
        local pid = tonumber(file:read("*a"));
@@ -71,7 +89,7 @@ end
 function isrunning()
        local ok, pid, err = _M.getpid();
        if not ok then
-               if pid == "pidfile-read-failed" then
+               if pid == "pidfile-read-failed" or pid == "pidfile-not-locked" then
                        -- Report as not running, since we can't open the pidfile
                        -- (it probably doesn't exist)
                        return true, false;
@@ -91,10 +109,8 @@ function start()
        end
        if not CFG_SOURCEDIR then
                os.execute("./prosody");
-       elseif CFG_SOURCEDIR:match("^/usr/local") then
-               os.execute("/usr/local/bin/prosody");
        else
-               os.execute("prosody");
+               os.execute(CFG_SOURCEDIR.."/../../bin/prosody");
        end
        return true;
 end