X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=util%2Fprosodyctl.lua;h=7f3ce20e028ac811eeaa9564592f561b9f98783f;hb=d67b44d083d688733b9e4f8fe66e0b4c6995dccb;hp=2213e2d711939ae1d636cc7b29fc30c2a28c8b6d;hpb=5276a539becd80fa6eafd55ebd6d8cad9ec8ecf7;p=prosody.git

diff --git a/util/prosodyctl.lua b/util/prosodyctl.lua
index 2213e2d7..7f3ce20e 100644
--- a/util/prosodyctl.lua
+++ b/util/prosodyctl.lua
@@ -1,9 +1,18 @@
+-- Prosody IM
+-- Copyright (C) 2008-2010 Matthew Wild
+-- Copyright (C) 2008-2010 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;
 
@@ -12,6 +21,8 @@ local tostring, tonumber = tostring, tonumber;
 
 local CFG_SOURCEDIR = _G.CFG_SOURCEDIR;
 
+local prosody = prosody;
+
 module "prosodyctl"
 
 function adduser(params)
@@ -21,6 +32,11 @@ function adduser(params)
 	elseif not host then
 		return false, "invalid-hostname";
 	end
+
+	local provider = prosody.hosts[host].users;
+	if not(provider) or provider.name == "null" then
+		usermanager.initialize_host(host);
+	end
 	
 	local ok = usermanager.create_user(user, password, host);
 	if not ok then
@@ -30,6 +46,11 @@ function adduser(params)
 end
 
 function user_exists(params)
+	local provider = prosody.hosts[params.host].users;
+	if not(provider) or provider.name == "null" then
+		usermanager.initialize_host(params.host);
+	end
+	
 	return usermanager.user_exists(params.user, params.host);
 end
 
@@ -56,11 +77,17 @@ 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", 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"));
 	file:close();
 	
@@ -74,7 +101,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;
@@ -94,10 +121,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