From a8785ad7df51e820a6fe134b063870748558cdef Mon Sep 17 00:00:00 2001 From: Tristan Sloughter Date: Tue, 14 Mar 2017 21:44:42 -0700 Subject: [PATCH] add hex metadata and use hex packages --- config/sys.config | 14 ++++++++ rebar.config | 6 +++- rebar.lock | 84 +++++++++++++-------------------------------- src/lasp_pg.app.src | 8 +++-- src/lasp_pg.erl | 2 +- 5 files changed, 49 insertions(+), 65 deletions(-) create mode 100644 config/sys.config diff --git a/config/sys.config b/config/sys.config new file mode 100644 index 0000000..91128f2 --- /dev/null +++ b/config/sys.config @@ -0,0 +1,14 @@ +%% -*- erlang -*- +[{erleans, [{default_provider, ets_provider}]}, + + {lasp, [{storage_backend, lasp_ets_storage_backend}, + {mode, delta_based}, + {delta_interval, 200}]}, + + {plumtree, [{broadcast_exchange_timer, 60000}, + {broadcast_mods, [lasp_plumtree_backend]}]}, + + {partisan, [{peer_port, 10200}, + {partisan_peer_service_manager, + partisan_default_peer_service_manager}]} +]. diff --git a/rebar.config b/rebar.config index b0815b8..458eeaa 100644 --- a/rebar.config +++ b/rebar.config @@ -1,4 +1,5 @@ -{deps, [{lasp, {git, "https://github.com/lasp-lang/lasp", {tag, "unstable"}}}]}. +{deps, [lasp, + types]}. {dialyzer_base_plt_apps, [kernel, stdlib, erts, sasl, eunit, syntax_tools, compiler, crypto]}. {xref_checks, [undefined_function_calls]}. @@ -10,6 +11,9 @@ {eunit_opts, [verbose, {report,{eunit_surefire,[{dir,"."}]}}]}. {edoc_opts, [{preprocess, true}]}. +{shell, [{apps, [lasp_pg]}, + {config, "config/sys.config"}]}. + {profiles, [ {lint, [ {plugins, [{rebar3_lint, {git, "https://github.com/project-fifo/rebar3_lint.git", {tag, "0.1.2"}}}]} diff --git a/rebar.lock b/rebar.lock index bc8e9f6..3a642de 100644 --- a/rebar.lock +++ b/rebar.lock @@ -1,68 +1,30 @@ {"1.1.0", [{<<"acceptor_pool">>,{pkg,<<"acceptor_pool">>,<<"1.0.0-rc.0">>},2}, - {<<"eini">>,{pkg,<<"eini">>,<<"1.2.4">>},2}, - {<<"erlcloud">>,{pkg,<<"erlcloud">>,<<"2.0.4">>},1}, - {<<"gb_trees_ext">>, - {git,"https://github.com/lasp-lang/gb_trees_ext", - {ref,"dba0bbc4bc55d4f062e0bf5c0b807a4eb915e934"}}, - 1}, - {<<"gen_flow">>, - {git,"https://github.com/lasp-lang/gen_flow", - {ref,"9a4d374e8083e9881a50b0d1f5d5497f7b8c6987"}}, - 1}, - {<<"goldrush">>,{pkg,<<"goldrush">>,<<"0.1.8">>},2}, - {<<"jsx">>,{pkg,<<"jsx">>,<<"2.8.0">>},1}, - {<<"lager">>,{pkg,<<"lager">>,<<"3.2.1">>},1}, - {<<"lasp">>, - {git,"https://github.com/lasp-lang/lasp", - {ref,"832e98e70df22677f17c730d29b9de193370705e"}}, - 0}, - {<<"lasp_support">>, - {git,"https://github.com/lasp-lang/lasp_support", - {ref,"f5b72230e04a16a511f30cef22cdda1204cd7585"}}, - 1}, - {<<"lhttpc">>,{pkg,<<"lhttpc">>,<<"1.4.0">>},2}, - {<<"mochiweb">>,{pkg,<<"mochiweb">>,<<"2.12.2">>},2}, - {<<"partisan">>, - {git,"https://github.com/lasp-lang/partisan", - {ref,"5fbd47fbff4df7664ef9a5626819e0dcf3436d1b"}}, - 1}, - {<<"plumtree">>, - {git,"https://github.com/lasp-lang/plumtree", - {ref,"709275b63b60bb5df5bd3705dcd9e268dca98982"}}, - 1}, - {<<"ranch">>,{pkg,<<"ranch">>,<<"1.2.1">>},1}, - {<<"rand_compat">>, - {git,"https://github.com/lasp-lang/rand_compat", - {ref,"4f658110f57bfd1a3e966a7d65b23d5c8f868167"}}, - 1}, - {<<"riak_dt">>, - {git,"git://github.com/helium/riak_dt.git", - {ref,"15d66cb26c2028c1ad1271c359b1d5da213825c3"}}, - 2}, + {<<"gen_flow">>,{pkg,<<"gen_flow">>,<<"0.0.3">>},1}, + {<<"goldrush">>,{pkg,<<"goldrush">>,<<"0.1.9">>},2}, + {<<"lager">>,{pkg,<<"lager">>,<<"3.2.4">>},1}, + {<<"lasp">>,{pkg,<<"lasp">>,<<"0.1.0">>},0}, + {<<"lasp_support">>,{pkg,<<"lasp_support">>,<<"0.0.1">>},1}, + {<<"partisan">>,{pkg,<<"partisan">>,<<"0.2.0">>},1}, + {<<"plumtree">>,{pkg,<<"plumtree">>,<<"0.2.0">>},1}, + {<<"rand_compat">>,{pkg,<<"rand_compat">>,<<"0.0.1">>},1}, + {<<"riak_dt">>,{pkg,<<"riak_dt">>,<<"2.1.1">>},2}, {<<"sext">>,{pkg,<<"sext">>,<<"1.4.0">>},1}, - {<<"time_compat">>, - {git,"https://github.com/lasp-lang/time_compat", - {ref,"6007f68892104ebb6fa2366cebf9d928d8856273"}}, - 1}, - {<<"types">>, - {git,"https://github.com/lasp-lang/types", - {ref,"393e6a360302a6a374d5f77615af3f3a93959deb"}}, - 1}, - {<<"webmachine">>, - {git,"https://github.com/webmachine/webmachine", - {ref,"8f1e4336771e96e24f4d046b671d42289b5113a7"}}, - 1}]}. + {<<"time_compat">>,{pkg,<<"time_compat">>,<<"0.0.1">>},1}, + {<<"types">>,{pkg,<<"types">>,<<"0.0.6">>},0}]}. [ {pkg_hash,[ {<<"acceptor_pool">>, <<"679D741DF87FC13599B1AEF2DF8F78F1F880449A6BEFAB7C44FB6FAE0E92A2DE">>}, - {<<"eini">>, <<"ABD64A0533398A6D714D21219BB85F2D41FDB42665AC4080939B7BFA8E55F386">>}, - {<<"erlcloud">>, <<"02B404335B19AE125424805467C7F94D3EF755B4E06EBF281438D2D41CD0F820">>}, - {<<"goldrush">>, <<"2024BA375CEEA47E27EA70E14D2C483B2D8610101B4E852EF7F89163CDB6E649">>}, - {<<"jsx">>, <<"749BEC6D205C694AE1786D62CEA6CC45A390437E24835FD16D12D74F07097727">>}, - {<<"lager">>, <<"EEF4E18B39E4195D37606D9088EA05BF1B745986CF8EC84F01D332456FE88D17">>}, - {<<"lhttpc">>, <<"61760AFEC1DDB98E47972BE93B13FBFF487A63D65B91A02C41122A0ADF83DA38">>}, - {<<"mochiweb">>, <<"80804AD342AFA3D7F3524040D4EED66CE74B17A555DE454AC85B07C479928E46">>}, - {<<"ranch">>, <<"A6FB992C10F2187B46FFD17CE398DDF8A54F691B81768F9EF5F461EA7E28C762">>}, - {<<"sext">>, <<"2A9443A90C3164231A5E11C73133C4B1762B27FBF1647AA0DE06EF565C47B38B">>}]} + {<<"gen_flow">>, <<"639F5C3F52DC3F7459542DE3F72D5BFF11EB7DB8FB055657A3011F9A70FCF0D7">>}, + {<<"goldrush">>, <<"F06E5D5F1277DA5C413E84D5A2924174182FB108DABB39D5EC548B27424CD106">>}, + {<<"lager">>, <<"A6DEB74DAE7927F46BD13255268308EF03EB206EC784A94EAF7C1C0F3B811615">>}, + {<<"lasp">>, <<"6AAFAE96D3AD581FDED9B278E8F39BE9330FB9DA662D32C1E5F00A8ECCD942A5">>}, + {<<"lasp_support">>, <<"28E79936E10C5BFB9B8246AC1F4F8385224D4E1E288F318C6D51C42D277A7A6E">>}, + {<<"partisan">>, <<"8E44E20FD2E904D53D8FF2287C1397F71BC9BFF36B4DB6996C207AAFEFBE3ED1">>}, + {<<"plumtree">>, <<"610B850167BE9F89156E04F367091C0B2FE56DEEA8C54D3EC9AB0BF758E622E1">>}, + {<<"rand_compat">>, <<"624B590931D27252D0BCF710211699DB3695540706F57D2E91B918A17AB58839">>}, + {<<"riak_dt">>, <<"56B1898A543C561994F5D052FDEA972525CA98F46FDB3DCDB7366E4F92EE8F54">>}, + {<<"sext">>, <<"2A9443A90C3164231A5E11C73133C4B1762B27FBF1647AA0DE06EF565C47B38B">>}, + {<<"time_compat">>, <<"23FE0AD1FDF3B5B88821B2D04B4B5E865BF587AE66056D671FE0F53514ED8139">>}, + {<<"types">>, <<"DF10A65C2A06B79D300BD74DEB783FA8E9B16A1B5AFC75F26C0C7302D558EEE9">>}]} ]. diff --git a/src/lasp_pg.app.src b/src/lasp_pg.app.src index df012d3..050f33a 100644 --- a/src/lasp_pg.app.src +++ b/src/lasp_pg.app.src @@ -5,8 +5,12 @@ {registered, []}, {applications, [ kernel, - stdlib + stdlib, + lasp ]}, {mod, {lasp_pg_app, []}}, - {modules, []} + {modules, []}, + {maintainers,["Christopher S. Meiklejohn"]}, + {links,[{"Github","https://github.com/lasp-lang/lasp_pg"}]}, + {licenses,["Apache 2"]} ]}. diff --git a/src/lasp_pg.erl b/src/lasp_pg.erl index 4764f76..0bed43c 100644 --- a/src/lasp_pg.erl +++ b/src/lasp_pg.erl @@ -43,7 +43,7 @@ members(Group) -> GroupName = term_to_binary(Group), lasp:query({GroupName, ?SET}). -%% @doc Add a member to the process group. +%% @doc Remove a member to the process group. leave(Group, Pid) -> GroupName = term_to_binary(Group), {ok, {_, _, _, Value}} = lasp:update({GroupName, ?SET}, {rmv, Pid}, actor()),