prosody-hg: util/adminstream.lua comparison

util.prosodyctl.shell, util.adminstream: Move connection logic into adminstream for easier reuse

comparison

equal deleted inserted replaced

-:98c535531450
+:09674bbb833f
 	end
 end
 --- Public methods
+local function new_connection(socket_path, listeners)
+	local have_unix, unix = pcall(require, "socket.unix");
+	if type(unix) ~= "table" then
+		have_unix = false;
+	end
+	local conn, sock;
+	return {
+		connect = function ()
+			if not have_unix then
+				return nil, "no unix socket support";
+			end
+			if sock or conn then
+				return nil, "already connected";
+			end
+			sock = unix.stream();
+			sock:settimeout(0);
+			local ok, err = sock:connect(socket_path);
+			if not ok then
+				return nil, err;
+			end
+			conn = server.wrapclient(sock, nil, nil, listeners, "*a");
+			return true;
+		end;
+		disconnect = function ()
+			if conn then
+				conn:close();
+				conn = nil;
+			end
+			if sock then
+				sock:close();
+				sock = nil;
+			end
+			return true;
+		end;
+	};
+end
 local function new_server(sessions, stanza_handler)
 	local listeners = {};
 	function listeners.onconnect(conn)
 		log("debug", "New connection");
 	return client;
 end
 return {
+	connection = new_connection;
 	server = new_server;
 	client = new_client;
 };

Mercurial > prosody-hg