[openserverplatform commit] r106 - Merged the no-otp branch into master, TRUNK is now the osp_0.3-rc1 release!

[codesite...@google.com]

Author: discipleofranok
Date: Fri Apr 10 19:29:23 2009
New Revision: 106

Added:
trunk/README
Modified:
trunk/Makefile
trunk/osp.erl
trunk/osp_broker.erl
trunk/start-osp.sh

Log:
Merged the no-otp branch into master, TRUNK is now the osp_0.3-rc1 release!

Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Fri Apr 10 19:29:23 2009
@@ -2,4 +2,4 @@
erlc osp_*.erl
erlc osp.erl
clean:
- -rm osp_*.beam *~ osp.beam
+ -rm osp_*.beam *~ osp.beam erl_crash.dump

Added: trunk/README
==============================================================================
--- (empty file)
+++ trunk/README Fri Apr 10 19:29:23 2009
@@ -0,0 +1 @@
+Open Server Platform (OSP) is an open source (MIT License) project to make
it easier to create secure, multi-threaded servers that can be distributed
(onto the cloud even). You can find more information about OSP at
http://www.openserverplatform.com. The main repository is on Google Code,
but since SVN is such a nightmare to use, the bleeding edge code will be
kept here, and puch to Google every time something big happens.

Modified: trunk/osp.erl
==============================================================================
--- trunk/osp.erl (original)
+++ trunk/osp.erl Fri Apr 10 19:29:23 2009
@@ -2,10 +2,10 @@
%% @author Jacob Torrey <torr...@clarkson.edu>
%% @doc The OSP jumping off module
-module(osp).
--export([start/0, stop/0, join/1, get_conf/2, setup/0]).
+-export([start/0, join/1, get_conf/2, setup/0]).

%% @doc Starts the first 'master' node
-%% @spec init() -> {ok, Pid, []} | {error, Reason}
+%% @spec start() -> ok
start() ->
ConfFile = "osp.conf",
case get_conf(usefqdn, ConfFile) of
@@ -15,20 +15,7 @@
net_kernel:start([get_conf(nodename, ConfFile), shortnames])
end,
erlang:set_cookie(node(), get_conf(cookie, ConfFile)),
- Pid = osp_broker:start(osp_admin, get_conf(adminport, ConfFile)),
- case Pid of
- {error, Err} ->
- {error, Err};
- _ ->
- {ok, Pid, []}
- end.
-
-%% @doc Stops OSP on this node
-%% @spec stop(Reason, State) -> ok
-stop() ->
- osp_broker:stop(osp_broker),
- osp_broker:shutdown(),
- ok.
+ osp_broker:start(osp_admin, get_conf(adminport, ConfFile)).

%% @doc Setups mnesia for the first time
%% @spec setup() -> ok

Modified: trunk/osp_broker.erl
==============================================================================
--- trunk/osp_broker.erl (original)
+++ trunk/osp_broker.erl Fri Apr 10 19:29:23 2009
@@ -33,7 +33,7 @@
CP = osp_proto:set_control(apply(Name, proto, [])),
CP(LSock, Pid),
erlang:register(Name, Pid),
- Pid;
+ ok;
Error ->
{error, Error}
end.

Modified: trunk/start-osp.sh
==============================================================================
--- trunk/start-osp.sh (original)
+++ trunk/start-osp.sh Fri Apr 10 19:29:23 2009
@@ -2,5 +2,5 @@

echo "Starting OSP"
epmd -daemon
-erl -smp auto -run osp init
-echo "OSP started, telnet to localhost port 9876 to continue"
+erl -smp auto -run osp -detached
+echo "OSP started, telnet to the localhost management port (default 9876)
to continue"