capricorn 2.0.8 → 2.0.9

data/erlang/lib/capricorn/ebin/capricorn.app

@@ -20,6 +20,7 @@
     cap_cluster,
     cap_cluster_gems,
     cap_config,
+    cap_console_dispatcher,
     cap_dets_updater,
     cap_events,
     cap_event_sup,
@@ -53,6 +54,6 @@
     cap_secondary_services,
     cap_sup
   ]},
-  {applications, [kernel, stdlib, sasl, inets, bertio, bertrpc, emq]},
+  {applications, [kernel, stdlib, sasl, inets, bertio, bertrpc, emq, misultin, ejson]},
   {mod, {capricorn_app, []}}
 ]}.

data/erlang/lib/capricorn/include/capricorn.hrl

@@ -11,6 +11,7 @@
 %%
 
 -define(b2a(V), list_to_atom(binary_to_list(V))).
+-define(a2b(V), list_to_binary(atom_to_list(V))).
 -define(b2l(V), binary_to_list(V)).
 -define(l2b(V), list_to_binary(V)).
 

data/erlang/lib/capricorn/src/cap_cluster_gems.erl

@@ -2,7 +2,7 @@
 -behaviour(gen_server).
 -include("capricorn.hrl").
 
--export([start_link/0, push/1, missing/0, lookup/1, lookup/2, pull/1, pull/2, check/0, all/0]).
+-export([start_link/0, push/1, missing/0, lookup/1, lookup/2, pull/1, pull/2, check/0, all/0, all/1]).
 -export([init/1, handle_call/3, handle_cast/2,
          handle_info/2, terminate/2, code_change/3]).
 
@@ -52,6 +52,11 @@ all() ->
   gen_server:call(cap_cluster_gems, {all}).
 
 
+-spec all(node()) -> {ok, [gem_id()]} .
+all(Node) ->
+  gen_server:call({cap_cluster_gems, Node}, {all}).
+
+
 -spec check() -> ok .
 check() ->
   gen_server:cast(cap_cluster_gems, check).

data/erlang/lib/capricorn/src/cap_console_dispatcher.erl

@@ -0,0 +1,214 @@
+-module(cap_console_dispatcher).
+-export([start_link/1, stop/0]).
+-include("capricorn.hrl").
+
+% start misultin http server
+start_link(Port) ->
+  misultin:start_link([
+    {port, Port},
+    {loop,    fun(Req) -> handle_http(Req, Port) end},
+    {ws_loop, fun(Ws)  -> handle_websocket(Ws)   end}
+  ]).
+
+% stop misultin
+stop() ->
+  misultin:stop().
+
+% callback on request received
+handle_http(Req, _Port) ->
+  handle_rest(Req:get(method), Req:resource([lowercase, urldecode]), Req).
+
+
+handle_rest('GET', [], Req) ->
+  Req:ok("Hello World.");
+
+handle_rest(Method, ["machines" |Rest], Req) ->
+  handle_machines_rest(Method, Rest, Req);
+
+handle_rest(Method, ["gems" |Rest], Req) ->
+  handle_gems_rest(Method, Rest, Req);
+
+handle_rest(_, _, Req) ->
+  handle_404(Req).
+
+
+handle_gems_rest('GET', [], Req) ->
+  {ok, All} = cap_cluster_gems:all(cap_config:get(machine, cluster, cluster)),
+  JSON = lists:foldl(fun(Gem, Acc) ->
+    [gem_id_to_json(Gem) |Acc]
+  end, [], All),
+  Req:ok([{"Content-Type", "application/json"}], ejson:encode(JSON));
+
+handle_gems_rest('POST', [], Req) ->
+  Req:ok([{"Content-Type", "text/plain"}], "handle_gems_rest: POST, []");
+
+handle_gems_rest(Method, [Gem, Version |Rest], Req) ->
+  handle_gem_rest(Method, {Gem, Version}, Rest, Req);
+
+handle_gems_rest(_, _, Req) ->
+  handle_404(Req).
+
+
+handle_gem_rest('GET', {Gem, Version}, [], Req) ->
+  Req:ok([{"Content-Type", "text/plain"}], "handle_gem_rest: GET, ~p, []", [{Gem, Version}]);
+
+handle_gem_rest('PUT', {Gem, Version}, [], Req) ->
+  Req:ok([{"Content-Type", "text/plain"}], "handle_gem_rest: PUT, ~p, []", [{Gem, Version}]);
+
+handle_gem_rest('DELETE', {Gem, Version}, [], Req) ->
+  Req:ok([{"Content-Type", "text/plain"}], "handle_gem_rest: DELETE, ~p, []", [{Gem, Version}]);
+
+handle_gem_rest(_, _, _, Req) ->
+  handle_404(Req).
+
+
+handle_machines_rest('GET', [], Req) ->
+  Nodes    = [atom_to_list(node()) | [atom_to_list(Node)   || Node <- nodes()]],
+  Machines = [list_to_binary(Node) || Node <- Nodes,
+               string:substr(Node, 1, 8) == "machine-"],
+  Req:ok([{"Content-Type", "application/json"}], ejson:encode(Machines));
+
+handle_machines_rest(Method, [Machine |Rest], Req) ->
+  handle_machine_rest(Method, Machine, Rest, Req);
+
+handle_machines_rest(_, _, Req) ->
+  handle_404(Req).
+
+
+handle_machine_rest(Method, Machine, ["applications" |Rest], Req) ->
+  handle_apps_rest(Method, Machine, Rest, Req);
+
+handle_machine_rest(_, _, _, Req) ->
+  handle_404(Req).
+
+
+handle_apps_rest('GET', Machine, [], Req) ->
+  All  = cap_machine_apps:all(list_to_atom(Machine)),
+  JSON = lists:foldl(fun(App, Acc) ->
+    [app_to_json(App) |Acc]
+  end, [], All),
+  Req:ok([{"Content-Type", "application/json"}], ejson:encode(JSON));
+
+handle_apps_rest('POST', Machine, [], Req) ->
+  Req:ok([{"Content-Type", "text/plain"}], "handle_apps_rest: POST, ~p, []", [Machine]);
+
+handle_apps_rest(Method, Machine, [Application |Rest], Req) ->
+  handle_app_rest(Method, Machine, Application, Rest, Req);
+
+handle_apps_rest(_, _, _, Req) ->
+  handle_404(Req).
+
+
+handle_app_rest('GET', Machine, Application, [], Req) ->
+  Resp = cap_machine_apps:one(list_to_atom(Machine), ?l2b(Application)),
+  case Resp of
+  {ok, App} ->
+    JSON = ejson:encode(app_to_json(App)),
+    Req:ok([{"Content-Type", "application/json"}], JSON);
+  _ ->
+    handle_404(Req)
+  end;
+
+handle_app_rest('PUT', Machine, Application, [], Req) ->
+  Req:ok([{"Content-Type", "text/plain"}], "handle_apps_rest: PUT, ~p, ~p, []", [Machine, Application]);
+
+handle_app_rest('DELETE', Machine, Application, [], Req) ->
+  Req:ok([{"Content-Type", "text/plain"}], "handle_apps_rest: DELETE, ~p, ~p, []", [Machine, Application]);
+
+handle_app_rest('POST', Machine, Application, ["start"], Req) ->
+  Req:ok([{"Content-Type", "text/plain"}], "handle_apps_rest: POST, ~p, ~p, [start]", [Machine, Application]);
+
+handle_app_rest('POST', Machine, Application, ["restart"], Req) ->
+  Req:ok([{"Content-Type", "text/plain"}], "handle_apps_rest: POST, ~p, ~p, [restart]", [Machine, Application]);
+
+handle_app_rest('POST', Machine, Application, ["stop"], Req) ->
+  Req:ok([{"Content-Type", "text/plain"}], "handle_apps_rest: POST, ~p, ~p, [stop]", [Machine, Application]);
+
+handle_app_rest('POST', Machine, Application, ["update"], Req) ->
+  Req:ok([{"Content-Type", "text/plain"}], "handle_apps_rest: POST, ~p, ~p, [update]", [Machine, Application]);
+
+handle_app_rest(_, _, _, _, Req) ->
+  handle_404(Req).
+
+
+handle_404(Req) ->
+  Req:respond(404, [{"Content-Type", "text/plain"}], "Page not found.").
+
+
+% callback on received websockets data
+handle_websocket(Ws) ->
+  receive
+    {browser, Data} ->
+      Ws:send(["received '", Data, "'"]),
+      handle_websocket(Ws);
+    _Ignore ->
+      handle_websocket(Ws)
+  after 5000 ->
+    Ws:send("pushing!"),
+    handle_websocket(Ws)
+  end.
+
+
+
+
+
+app_to_json(App) ->
+  % -record(application, {
+  %   id=undefined            :: 'undefined' | binary(),
+  %   node=undefined          :: 'undefined' | atom(),
+  %   name=undefined          :: 'undefined' | binary(),
+  %   domains=[]              :: [binary(),...],
+  %   environment=development :: atom(),
+  %   www_user=undefined      :: 'undefined' | binary(),
+  %   www_group=undefined     :: 'undefined' | binary(),
+  %   root_path=undefined     :: 'undefined' | binary(),
+  %   installed_gems=[]       :: [gem_id()],
+  %   required_gems=[]        :: [binary()],
+  %   rvsn={rvsn, 0}
+  % }).
+    
+  {[
+    {<<"id">>,             App#application.id},
+    {<<"node">>,           ?a2b(App#application.node)},
+    {<<"name">>,           App#application.name},
+    {<<"domains">>,        App#application.domains},
+    {<<"environment">>,    ?a2b(App#application.environment)},
+    {<<"www_user">>,       App#application.www_user},
+    {<<"www_group">>,      App#application.www_group},
+    {<<"root_path">>,      App#application.root_path},
+    {<<"installed_gems">>, lists:foldl(fun(Gem, Acc1) ->
+        [gem_id_to_json(Gem) |Acc1]
+      end, [], App#application.required_gems)},
+    {<<"required_gems">>,  App#application.required_gems}
+  ]}.
+
+
+gem_id_to_json(Gem) ->
+  % -record(gem_id, {
+  %   name    :: binary(),
+  %   version :: version()
+  % }).
+  % -type version_part()  :: pos_integer() | string() .
+  % -type version_parts() :: [version_part(),...] .
+  % -type version()       :: {version_parts()} .
+  
+  {Parts} = Gem#gem_id.version,
+  Version = lists:foldl(fun(Part, Acc2) ->
+    Str = case Part of
+    Part when is_integer(Part) ->
+      integer_to_list(Part);
+    Part ->
+      Part
+    end,
+    
+    case Acc2 of
+    undefined -> Str;
+    _ -> Acc2 ++ [$. |Str]
+    end
+  end, undefined, Parts),
+  
+  {[
+    {<<"name">>,    Gem#gem_id.name},
+    {<<"version">>, ?l2b(Version)}
+  ]}.
+

data/erlang/lib/capricorn/src/cap_machine_apps.erl

@@ -5,7 +5,7 @@
 
 
 -export([start_link/0]).
--export([create/4, create/5, import/7, import/8, update/3, update/4, fupdate/1, fupdate/2, update_gem/1, update_gem/2, all/0, all/1]).
+-export([create/4, create/5, import/7, import/8, update/3, update/4, fupdate/1, fupdate/2, update_gem/1, update_gem/2, all/0, all/1, one/1, one/2]).
 -export([init/1, handle_call/3, handle_cast/2,
          handle_info/2, terminate/2, code_change/3]).
 
@@ -105,6 +105,20 @@ all(Node) ->
 
 
 
+-spec one(binary()) -> application().
+
+one(Id) ->
+  gen_server:call(cap_machine_apps, {one, Id}).
+
+
+
+-spec one(atom(), binary()) -> application().
+
+one(Node, Id) ->
+  gen_server:call({cap_machine_apps, Node}, {one, Id}).
+
+
+
 %%% Initialize the server
 init([]) ->
   Root   = cap_config:get(machine, database, "var/run/capricorn"),
@@ -126,6 +140,16 @@ handle_call({all}, _From, #ctx{apps=Apps}=State) ->
   All = dets:foldl(fun(App, Acc) -> [App|Acc] end, [], Apps),
   {reply, All, State};
 
+handle_call({one, Id}, _From, #ctx{}=State) ->
+  try
+    {ok, App} = do_lookup_app(Id, State),
+    {reply, {ok, App}, State}
+  catch
+    T:E ->
+      ?LOG_ERROR("error while getting one app ~s: ~p", [Id, E]),
+      {reply, {T, E}, State}
+  end;
+
 handle_call(_Request, _From, State) ->
   {reply, ok, State}.
 

data/erlang/lib/capricorn/src/cap_sup.erl

@@ -88,6 +88,7 @@ start_server(NodeType) ->
 
 start_primary_services(cluster) ->
   ExternalApi = cap_config:get(cluster, api),
+  ConsolePort = cap_config:get(cluster, console_port),
 
   supervisor:start_link({local, cap_primary_services}, cap_sup,
   {{one_for_one, 10, 3600},[
@@ -121,6 +122,12 @@ start_primary_services(cluster) ->
       1000,
       worker,
       [cap_external_api]},
+    {cap_console_dispatcher,
+      {cap_console_dispatcher, start_link, [ConsolePort]},
+      permanent,
+      1000,
+      worker,
+      [cap_console_dispatcher]},
     {cap_runtime,
       {cap_runtime, start_link, ["cluster"]},
       permanent,
@@ -130,6 +137,7 @@ start_primary_services(cluster) ->
   ]});
 start_primary_services(machine) ->
   InternalApi = cap_config:get(machine, api),
+  ConsolePort = cap_config:get(machine, console_port),
 
   supervisor:start_link({local, cap_primary_services}, cap_sup,
   {{one_for_one, 10, 3600},[
@@ -169,6 +177,12 @@ start_primary_services(machine) ->
       infinity,
       supervisor,
       [cap_machine_apps_sup]},
+    {cap_console_dispatcher,
+      {cap_console_dispatcher, start_link, [ConsolePort]},
+      permanent,
+      1000,
+      worker,
+      [cap_console_dispatcher]},
     {cap_runtime,
       {cap_runtime, start_link, ["machine"]},
       permanent,

data/erlang/lib/ejson/Makefile

@@ -0,0 +1,24 @@
+
+all: test
+
+test: beam
+	test/literals.escript
+	test/numbers.escript
+	test/strings.escript
+	test/objects.escript
+	test/arrays.escript
+	test/compound.escript
+	test/timing.escript
+
+BUILT=\
+    ebin/ejson.beam \
+	ebin/ejson_decode.beam \
+	ebin/ejson_encode.beam \
+	ebin/mochijson2.beam \
+	ebin/rfc4627.beam
+
+beam: $(BUILT)
+
+ebin/%.beam: src/%.erl
+	@mkdir -p ebin
+	erlc -o ebin/ $<

data/erlang/lib/ejson/ebin/ejson.app

@@ -0,0 +1,9 @@
+%% This is the application resource file (.app file) for the bert,
+%% application.
+{application, ejson, 
+  [{description, "JSON encoder / decoder"},
+   {vsn, "0.1.0"},
+   {modules, [ejson, ejson_decode, ejson_encode]},
+   {registered,[]},
+   {applications, [kernel, stdlib]}
+]}.

data/erlang/lib/ejson/include/ejson.hrl

@@ -0,0 +1,40 @@
+
+% Characters
+-define(DQ, 34).    % Double quote
+-define(PL, 43).    % Plus sign
+-define(CM, 44).    % Comma
+-define(HY, 45).    % Hyphen
+-define(PR, 46).    % Period
+-define(FS, 47).    % Forward solidus
+-define(ZR, 48).    % Zero
+-define(NI, 57).    % Nine
+-define(CL, 58).    % Colon
+-define(UE, 69).    % E
+-define(LB, 91).    % Left bracket
+-define(RS, 92).    % Reverse solidus
+-define(RB, 93).    % Right bracket
+-define(LE, 101).   % e
+-define(LC, 123).   % Left curly brace
+-define(RC, 125).   % Right curly brace
+
+% Escapes
+-define(ESDQ, 16#5C22). % \"
+-define(ESRS, 16#5C5C). % \\
+-define(ESFS, 16#5C2F). % \/
+-define(ESBS, 16#5C62). % \b
+-define(ESFF, 16#5C66). % \f
+-define(ESNL, 16#5C6E). % \n
+-define(ESCR, 16#5C72). % \r
+-define(ESTB, 16#5C74). % \t
+-define(ESUE, 16#5C75). % \u
+
+% Whitespace
+-define(BS, 8).     % Backspace
+-define(TB, 9).     % Tab
+-define(NL, 10).    % New line
+-define(FF, 12).    % Form feed
+-define(CR, 13).    % Carriage return
+-define(SP, 32).    % Space
+
+% Error
+-define(EXIT(E), throw({error, E})).

data/erlang/lib/ejson/rebar.config

@@ -0,0 +1,3 @@
+{cover_enabled, true}.
+{erl_opts, [debug_info, fail_on_warning, {i, ".."}]}.
+{lib_dirs, [".."]}.

data/erlang/lib/ejson/src/ejson.erl

@@ -0,0 +1,22 @@
+
+-module(ejson).
+
+-export([decode/1, encode/1]).
+
+decode(Data) when is_list(Data) ->
+    decode(list_to_binary(Data));
+decode(Data) when is_binary(Data) ->
+    case (catch ejson_decode:value(Data)) of
+        {error, Reason} ->
+            throw({invalid_json, Reason});
+        {_Rest, EJson} ->
+            EJson
+    end.
+    
+encode(Term) ->
+    case (catch ejson_encode:value(Term)) of
+        {error, Reason} ->
+            throw({invalid_erljson, Reason});
+        Else ->
+            Else
+    end.