@@ -5,3 +5,5 @@ Mnesia.nonode@nohost/ *.log #*# .#* +twoorl.mnesia/ +twoorl_stats .gitignore @@ -1,4 +1,6 @@ {"src/twoorl.erl", [{outdir, "./ebin"}]}. +{"src/twoorl_sup.erl", [{outdir, "./ebin"}]}. +{"src/twoorl_server.erl", [{outdir, "./ebin"}]}. {"src/twoorl_util.erl", [{outdir, "./ebin"}]}. {"elib/rfc4627/*", [{outdir, "./ebin"}]}. {"elib/twitter_client/*", [{outdir, "./ebin"}]}. \ No newline at end of file Emakefile @@ -1,7 +1,8 @@ all: code code: clean - erl -s make all load -run twoorl init_mysql -run twoorl compile -s init stop + ## erl -s make all load -run twoorl init_mysql -run twoorl compile -s init stop + erl -s make all load -s init stop clean: rm -fv ebin/*.beam twoorl.rel twoorl.script twoorl.boot erl_crash.dump *.log *.access Makefile @@ -16,6 +16,6 @@ To run in embedded mode: $ make clean && make && make init $ erl -sname twoorlapp -setcookie twoorl -mnesia dir "'twoorl.mnesia'" -yaws embedded true -pa ebin -boot start_sasl 1> [application:start(X) || X <- [inets, crypto, mnesia, twoorl]]. -2> twoorl:start(). +[ok, ok, ok, ok] # Nick Gerakines README.txt @@ -1,14 +1,19 @@ {application, twoorl, [ {description, "Twoorl is an open-source Twitter clone."}, {vsn, "0.3"}, - {modules, [ - twoorl, - twoorl_server, - twoorl_sup - ]}, + {modules, [twoorl, twoorl_server, twoorl_sup]}, {registered, [twoorl]}, - {env, []}, {applications, [kernel, stdlib, sasl, crypto, inets, mnesia]}, {mod, {twoorl, []}}, - {start_phases, []} + {env, [ + {dbconns, [ + {"localhost", "root", "password", "twoorl", 3} + ]}, + {tables, [session]} + ]}, + {start_phases, [ + {mysql, []}, + {mnesia, []}, + {compile, []} + ]} ]}. ebin/twoorl.app @@ -26,13 +26,54 @@ start(_Type, _Args) -> twoorl_sup:start_link([]). -start() -> - application:start(inets), - init_mnesia(), - TablesInfo = [{session, [{attributes, record_info(fields, session)}]}], - create_mnesia_tables(TablesInfo), - init_mysql(), - compile(). +start_phase(mysql, _, _) -> + {ok, DBConfig} = application:get_env(twoorl, dbconns), + [begin + mysql_connect(PoolSize, Hostname, User, Password, Database, true) + end || {Hostname, User, Password, Database, PoolSize} <- DBConfig], + ok; + +start_phase(compile, _, _) -> + twoorl:compile(), + ok; + +%% Having the mnesia store on a separate but connected node with a module +%% to handle its maintenance would move a lot of this foo out of the +%% application stack. Eventually that really needs to happen. -- nkg +start_phase(mnesia, _, _) -> + %% Mnesia should have been started already, because of that the schema + %% is in memory if the schema doesn't already exist on disc. If so we + %% change the type so that it writes to the mnesia dir we set. -- nkg + case mnesia:table_info(schema, storage_type) of + ram_copies -> + mnesia:change_table_copy_type(schema, node(), disc_copies); + _ -> + ok + end, + ExistingTables = mnesia:system_info(tables) -- [schema], + {ok, Tables} = application:get_env(twoorl, tables), + [begin + create_table(session) + end || Table <- Tables, not lists:member(Table, ExistingTables)], + ok. + +create_table(session) -> + mnesia:create_table(session, [{attributes, record_info(fields, session)}]), + ok. + +mysql_connect(0, _, _, _, _, _) -> ok; +mysql_connect(PoolSize, Hostname, User, Password, Database, true) -> + erlydb:start(mysql, [ + {hostname, Hostname}, + {username, User}, + {password, Password}, + {database, Database}, + {logfun, fun twoorl_util:log/4} + ]), + mysql_connect(PoolSize - 1, Hostname, User, Password, Database, false); +mysql_connect(PoolSize, Hostname, User, Password, Database, false) -> + mysql:connect(erlydb_mysql, Hostname, undefined, User, Password, Database, true), + mysql_connect(PoolSize - 1, Hostname, User, Password, Database, false). compile() -> compile([]). @@ -44,15 +85,28 @@ compile_update() -> compile([{last_compile_time, auto}]). compile(Opts) -> - erlyweb:compile(compile_dir(auto), + erlyweb:compile(compile_dir(default), [{erlydb_driver, mysql}, {erlydb_timeout, 20000} | Opts]). +compile_dir(auto) -> + {ok, CWD} = file:get_cwd(), CWD; +compile_dir(default) -> + ?APP_PATH; +compile_dir(appconfig) -> + {ok, CDir} = application:get_env(twoorl, compile_dir), + CDir; compile_dir(Dir) -> - case Dir of - auto -> {ok, CWD} = file:get_cwd(), CWD; - default -> ?APP_PATH; - _ -> Dir - end. + Dir. + +%% --- The rest of these functions will be deprecated --- %% + +start() -> + application:start(inets), + init_mnesia(), + TablesInfo = [{session, [{attributes, record_info(fields, session)}]}], + create_mnesia_tables(TablesInfo), + init_mysql(), + compile(). init_mnesia() -> ?L("creating schema"), @@ -98,7 +152,6 @@ create_table(Table, Def) -> exit(Err2) end. - init_mysql() -> erlydb:start(mysql, [{hostname, ?DB_HOSTNAME}, src/twoorl.erl @@ -1,7 +1,7 @@ %% We really need to move this stuff out of this file -- nkg. -define(DB_HOSTNAME, "localhost"). -define(DB_USERNAME, "root"). --define(DB_PASSWORD, "asd123"). +-define(DB_PASSWORD, "password"). -define(DB_DATABASE, "twoorl"). -define(DB_POOL_SIZE, 50). %-define(APP_PATH, "/home/yariv/apps//twoorl"). src/twoorl_app.hrl @@ -28,5 +28,5 @@ start_link(Args) -> init(Args) -> {ok, {{one_for_one, 10, 10}, [ - {twoorl_yaws, {twoorl_server, start_link, [Args]}, permanent, 2000, worker, [twoorl_server]} + {twoorl_yaws, {twoorl_server, start_link, [Args]}, permanent, 20000, worker, [twoorl_server]} ]}}. src/twoorl_sup.erl 61eccf7d6389c3c505210c943fe7406883f188c6 Nick Gerakines nick@gerakines.net http://github.com/yariv/twoorl/commit/0678c070f2a874fe7e2a00392f2ae07932f91284 0678c070f2a874fe7e2a00392f2ae07932f91284 2008-06-09T21:19:34-07:00 2008-06-09T21:19:34-07:00 Added mnesia, mysql and compile start phases. Moved misc but mutable config to twoorl.app. Made a number of changes to remove the application dependancy to twoorl:start/0, deprecated a lot of stuff. 8aaa07f080224041fdccefda73552918877e9421 Nick Gerakines nick@gerakines.net