Commit 668f2628 authored by Heinz N. Gies's avatar Heinz N. Gies

Support for otter

parent d6d71e6f
......@@ -129,12 +129,34 @@ build_opts(Req) ->
{O0, ReqX};
{<<>>, ReqX} ->
{[debug | O0], ReqX};
{true, ReqX} ->
{[debug | O0], ReqX};
{Token, ReqX} ->
{[debug, {token, Token} | O0], ReqX}
end,
case cowboy_req:qs_val(<<"graph">>, R1) of
{O2, R2} = case cowboy_req:qs_val(<<"trace_id">>, R1) of
{undefined, ReqX1} ->
{O1, ReqX1};
{<<>>, ReqX1} ->
{[{trace_id, otters_lib:id()} | O1], ReqX1};
{true, ReqX1} ->
{[{trace_id, otters_lib:id()} | O1], ReqX1};
{TraceID, ReqX1} ->
{[{trace_id, TraceID} | O1], ReqX1}
end,
{O3, R3} = case cowboy_req:qs_val(<<"parent_id">>, R2) of
{undefined, ReqX2} ->
{O2, ReqX2};
{<<>>, ReqX2} ->
{O2, ReqX2};
{true, ReqX2} ->
{O2, ReqX2};
{ParentID, ReqX2} ->
{[{parent_id, ParentID} | O2], ReqX2}
end,
case cowboy_req:qs_val(<<"graph">>, R3) of
{undefined, Rx1} ->
{O1, Rx1};
{O3, Rx1};
{_, Rx1} ->
{[return_graph | O1], Rx1}
{[return_graph | O3], Rx1}
end.
......@@ -16,8 +16,9 @@
{jsone, "~>1.2.3"},
fifo_utils,
{msgpack, "0.3.5"},
%%{dqe, "~>0.5.0"},
{dqe, ".*", {git, "https://github.com/dalmatinerdb/dqe.git", {branch, "master"}}},
{ddb_client, ".*", {git, "https://github.com/dalmatinerdb/ddb_client.git", {branch, "master"}}},
{dqe, ".*", {git, "https://github.com/dalmatinerdb/dqe.git", {branch, "otter"}}},
{otters, ".*", {git, "https://github.com/project-fifo/otters.git", {branch, "dev"}}},
eper,
recon
]}.
......@@ -110,6 +111,7 @@
{template, "\{\{build_dir\}\}/lib/dqe/priv/dqe.schema", "share/schema/02-dqe.schema"},
{template, "\{\{build_dir\}\}/lib/dqe_idx/priv/dqe_idx.schema", "share/schema/03-dqe_idx.schema"},
{template, "\{\{build_dir\}\}/lib/dqe_idx_pg/priv/dqe_idx_pg.schema", "share/schema/04-dqe_idx_pg.schema"},
{template, "_build/default/lib/fifo_lager/priv/lager.schema", "share/schema/06-lager.schema"},
{template, "schema/erlang_vm.schema", "share/schema/05-vm.schema"}
{template, "\{\{build_dir\}\}/lib/fifo_lager/priv/lager.schema", "share/schema/05-lager.schema"},
{template, "\{\{build_dir\}\}/lib/otters/priv/otters.schema", "share/schema/06-otters.schema"},
{template, "schema/erlang_vm.schema", "share/schema/99-vm.schema"}
]}]}.
......@@ -4,22 +4,32 @@
{<<"cowlib">>,{pkg,<<"cowlib">>,<<"1.0.2">>},1},
{<<"ddb_client">>,
{git,"https://github.com/dalmatinerdb/ddb_client.git",
{ref,"b13924c47e3151725c0cc5bfc0b58ee37a3131e9"}},
{ref,"b87b4d44ba7cd8ecd70e2c7dfc7a6f958fe03957"}},
0},
{<<"ddb_connection">>,{pkg,<<"ddb_connection">>,<<"0.2.1">>},1},
{<<"dflow">>,{pkg,<<"dflow">>,<<"0.1.7">>},1},
{<<"ddb_connection">>,
{git,"https://github.com/dalmatinerdb/ddb_connection.git",
{ref,"2990179dd52bdd626e8b8b94d3adbecab91b023c"}},
1},
{<<"dflow">>,
{git,"https://github.com/dalmatinerdb/dflow.git",
{ref,"10e5a2b8d056745fa6c258bbf8f88ced173b6f80"}},
1},
{<<"dproto">>,
{git,"https://github.com/dalmatinerdb/dproto.git",
{ref,"fb9885f41e227e09ac165225464f54c95d49e260"}},
0},
{ref,"f68cba09c7be0682693b3b7d59d5e4bb183d551d"}},
1},
{<<"dqe">>,
{git,"https://github.com/dalmatinerdb/dqe.git",
{ref,"3f7f22a4cd029a66642d3d1b83927e3b4e6bec35"}},
{ref,"d4eab218a286a087476ed0900a5e463624ca6ef3"}},
0},
{<<"dqe_fun">>,{pkg,<<"dqe_fun">>,<<"0.1.11">>},1},
{<<"dqe_fun">>,
{git,"https://github.com/dalmatinerdb/dqe_fun.git",
{ref,"df01d5778b0dbc9523dcb387b0c59e34b48ada1f"}},
1},
{<<"dqe_idx">>,{pkg,<<"dqe_idx">>,<<"0.2.1">>},1},
{<<"dqe_idx_ddb">>,{pkg,<<"dqe_idx_ddb">>,<<"0.2.4">>},1},
{<<"dqe_idx_pg">>,{pkg,<<"dqe_idx_pg">>,<<"0.3.6">>},1},
{<<"dynamic_compile">>,{pkg,<<"dynamic_compile">>,<<"1.0.0">>},1},
{<<"eper">>,{pkg,<<"eper">>,<<"0.94.0">>},0},
{<<"epgsql">>,{pkg,<<"epgsql">>,<<"3.3.0">>},3},
{<<"erlware_commons">>,{pkg,<<"erlware_commons">>,<<"1.0.0">>},0},
......@@ -27,9 +37,10 @@
{<<"fifo_utils">>,{pkg,<<"fifo_utils">>,<<"0.1.35">>},0},
{<<"goldrush">>,{pkg,<<"goldrush">>,<<"0.1.9">>},1},
{<<"hdr_histogram">>,{pkg,<<"hdr_histogram">>,<<"0.2.0">>},1},
{<<"ibrowse">>,{pkg,<<"ibrowse">>,<<"4.4.0">>},1},
{<<"jsone">>,{pkg,<<"jsone">>,<<"1.2.6">>},0},
{<<"jsx">>,{pkg,<<"jsx">>,<<"2.8.0">>},2},
{<<"jsxd">>,{pkg,<<"jsxd">>,<<"0.2.4">>},1},
{<<"jsxd">>,{pkg,<<"jsxd">>,<<"0.2.4">>},2},
{<<"lager">>,{pkg,<<"lager">>,<<"3.2.4">>},0},
{<<"lager_graylog">>,{pkg,<<"lager_graylog">>,<<"0.1.1">>},1},
{<<"lager_logstash_backend">>,
......@@ -37,6 +48,10 @@
1},
{<<"mmath">>,{pkg,<<"mmath">>,<<"0.2.17">>},1},
{<<"msgpack">>,{pkg,<<"msgpack">>,<<"0.3.5">>},0},
{<<"otters">>,
{git,"https://github.com/project-fifo/otters.git",
{ref,"8a78f88236fb85d991e96c1947ab095c82e2f931"}},
0},
{<<"pgapp">>,{pkg,<<"pgapp">>,<<"0.0.2">>},2},
{<<"poolboy">>,{pkg,<<"poolboy">>,<<"1.5.1">>},2},
{<<"qdate">>,
......@@ -47,19 +62,17 @@
{<<"quickrand">>,{pkg,<<"quickrand">>,<<"1.5.4">>},2},
{<<"ranch">>,{pkg,<<"ranch">>,<<"1.2.1">>},0},
{<<"recon">>,{pkg,<<"recon">>,<<"2.3.2">>},0},
{<<"snappiest">>,{pkg,<<"snappiest">>,<<"1.2.0">>},1},
{<<"snappiest">>,{pkg,<<"snappiest">>,<<"1.2.0">>},2},
{<<"uuid">>,{pkg,<<"uuid_erl">>,<<"1.5.4">>},1}]}.
[
{pkg_hash,[
{<<"cf">>, <<"7F2913FFF90ABCABD0F489896CFEB0B0674F6C8DF6C10B17A83175448029896C">>},
{<<"cowboy">>, <<"A324A8DF9F2316C833A470D918AAF73AE894278B8AA6226CE7A9BF699388F878">>},
{<<"cowlib">>, <<"9D769A1D062C9C3AC753096F868CA121E2730B9A377DE23DEC0F7E08B1DF84EE">>},
{<<"ddb_connection">>, <<"7454EBF58BA6BDC7730B10D07269620B6AE5C61DEBDF8C40ADC0C60E4E1B07D3">>},
{<<"dflow">>, <<"7B4B17789C99C7D9FECB4CFFA37841DB4C025F7823B1E7DDCE88A248DF53F27B">>},
{<<"dqe_fun">>, <<"C421415293F8C2DD29E7F31788E4FB06B57D0A5E38D527BF6C78E3C72CBC0BDA">>},
{<<"dqe_idx">>, <<"6BD1F0DE217DF0B213BD86CDBE19F5EEDBCAF0D5CBD51D955DB574A5C2DBA1EE">>},
{<<"dqe_idx_ddb">>, <<"2316B160D3EF3AAF2C60213A870D7B6A13C4035BF578DDC52301DA879099420C">>},
{<<"dqe_idx_pg">>, <<"5B93531BC946E53BED16947ADB01753F54DF6E057AD0B18AD13E603540C9A779">>},
{<<"dynamic_compile">>, <<"8171B2CB4953EA3ED2EF63F5B26ABF677ACD0CA32210C2A08A7A8406A743F76B">>},
{<<"eper">>, <<"F5FB2DAA0DF8878748E1C598428EDA942A173E5121FF35C1D632129B84593A3A">>},
{<<"epgsql">>, <<"974A578340E52012CBAB820CE756E7ED1DF1BAF0110C59A6753D8337A2CF9454">>},
{<<"erlware_commons">>, <<"087467DE5833C0BB5B3CCDD387F9E9C1FB816A75B7A709629BF24B5ED3246C51">>},
......@@ -67,6 +80,7 @@
{<<"fifo_utils">>, <<"649F4DCC5C640912A7686DED2B92F3E5B9C117146688DFFFCE518AD1B3E7D92A">>},
{<<"goldrush">>, <<"F06E5D5F1277DA5C413E84D5A2924174182FB108DABB39D5EC548B27424CD106">>},
{<<"hdr_histogram">>, <<"95A7EC3C8FA354E4CFBFC8F4168EE8F07BD3965CA22B9C45B2A2C9D13B03DCEC">>},
{<<"ibrowse">>, <<"2D923325EFE0D2CB09B9C6A047B2835A5EDA69D8A47ED6FF8BC03628B764E991">>},
{<<"jsone">>, <<"3EED1BC3F34D5727A011AB84A20230F4BDD8BB2B9C07C3AD0DCF412410231A74">>},
{<<"jsx">>, <<"749BEC6D205C694AE1786D62CEA6CC45A390437E24835FD16D12D74F07097727">>},
{<<"jsxd">>, <<"C14114AFCA463F2D03D3FB6CC81FD51CDA8CA86A47E5AC3ABDF0CA572A73A413">>},
......
......@@ -2,10 +2,10 @@
│ └─ cowlib─1.0.2
├─ dalmatiner_frontend─0.3.2
├─ ddb_client─0.4.2
│ ├─ dproto─0.4.1
│ │ ├─ jsxd─0.2.4
│ │ └─ snappiest─1.2.0
│ └─ mmath─0.2.17
├─ dproto─0.4.1
│ ├─ jsxd─0.2.4
│ └─ snappiest─1.2.0
├─ dqe─0.5.0
│ ├─ ddb_connection─0.2.1
│ │ └─ poolboy─1.5.1
......@@ -33,5 +33,8 @@
├─ lager─3.2.4
│ └─ goldrush─0.1.9
├─ msgpack─0.3.5
├─ otters─v0.1.4+build.123.ref8a78f88
│ ├─ dynamic_compile─1.0.0
│ └─ ibrowse─4.4.0
├─ ranch─1.2.1
└─ recon─2.3.2
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment