Browse Source

Fixed major bugs that made this unusable. Now all different ways using this lib work.

Raoul Hess 10 years ago
parent
commit
1df6120739
3 changed files with 11 additions and 5 deletions
  1. 2 1
      src/mysql_poolboy.app.src
  2. 2 1
      src/mysql_poolboy_app.erl
  3. 7 3
      src/mysql_poolboy_sup.erl

+ 2 - 1
src/mysql_poolboy.app.src

@@ -18,5 +18,6 @@
 {application, mysql_poolboy, [
 {application, mysql_poolboy, [
     {description, "MySQL/OTP + Poolboy"},
     {description, "MySQL/OTP + Poolboy"},
     {vsn, "0.0.1"},
     {vsn, "0.0.1"},
-    {modules, []}
+    {modules, []},
+    {mod, {mysql_poolboy_app, []}}
 ]}.
 ]}.

+ 2 - 1
src/mysql_poolboy_app.erl

@@ -22,7 +22,8 @@
 -export([start/2, stop/1]).
 -export([start/2, stop/1]).
 
 
 start(_Type, _Args) ->
 start(_Type, _Args) ->
-    supervisor:start_link({local, mysql_poolboy_sup}, ?MODULE, []).
+    lager:info("Startings mysql_poolboy god damnit!"),
+    supervisor:start_link({local, mysql_poolboy_sup}, mysql_poolboy_sup, []).
 
 
 stop(_State) ->
 stop(_State) ->
     ok.
     ok.

+ 7 - 3
src/mysql_poolboy_sup.erl

@@ -19,14 +19,18 @@
 -module(mysql_poolboy_sup).
 -module(mysql_poolboy_sup).
 
 
 -behaviour(supervisor).
 -behaviour(supervisor).
--export([init/1]).
+-export([start_link/0, init/1]).
+
+start_link() ->
+    supervisor:start_link({local, ?MODULE}, ?MODULE, []).
 
 
 init([]) ->
 init([]) ->
     Pools = application:get_all_env(mysql_poolboy),
     Pools = application:get_all_env(mysql_poolboy),
+    Pools1 = proplists:delete(included_applications, Pools),
     PoolSpec = lists:map(
     PoolSpec = lists:map(
         fun ({PoolName, {PoolArgs, MysqlArgs}}) ->
         fun ({PoolName, {PoolArgs, MysqlArgs}}) ->
-            mysqp_poolboy:child_spec(PoolName, PoolArgs, MysqlArgs)
+            mysql_poolboy:child_spec(PoolName, PoolArgs, MysqlArgs)
         end,
         end,
-        Pools
+        Pools1
     ),
     ),
     {ok, {{one_for_one, 10, 10}, PoolSpec}}.
     {ok, {{one_for_one, 10, 10}, PoolSpec}}.