Rollback a few recent Erlang changes to fix blame data
My combined patch for THRIFT-599 was committed, but it is preferable
commit the individual patches to preserve the more detailed log and
blame data. I'll recommit r987018 as a sequence of patches and r988722
as its own rev.
git-svn-id: https://svn.apache.org/repos/asf/incubator/thrift/trunk@990957 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/tutorial/erl/client.erl b/tutorial/erl/client.erl
index adaebe4..9780334 100644
--- a/tutorial/erl/client.erl
+++ b/tutorial/erl/client.erl
@@ -29,50 +29,46 @@
t() ->
Port = 9999,
+
+ {ok, Client} = thrift_client:start_link("127.0.0.1",
+ Port,
+ calculator_thrift),
- {ok, Client0} = thrift_client_util:new("127.0.0.1",
- Port,
- calculator_thrift,
- []),
-
- {Client1, {ok, ok}} = thrift_client:call(Client0, ping, []),
+ thrift_client:call(Client, ping, []),
io:format("ping~n", []),
- {Client2, {ok, Sum}} = thrift_client:call(Client1, add, [1, 1]),
+ {ok, Sum} = thrift_client:call(Client, add, [1, 1]),
io:format("1+1=~p~n", [Sum]),
- {Client3, {ok, Sum1}} = thrift_client:call(Client2, add, [1, 4]),
+ {ok, Sum1} = thrift_client:call(Client, add, [1, 4]),
io:format("1+4=~p~n", [Sum1]),
Work = #work{op=?tutorial_SUBTRACT,
num1=15,
num2=10},
- {Client4, {ok, Diff}} = thrift_client:call(Client3, calculate, [1, Work]),
+ {ok, Diff} = thrift_client:call(Client, calculate, [1, Work]),
io:format("15-10=~p~n", [Diff]),
- {Client5, {ok, Log}} = thrift_client:call(Client4, getStruct, [1]),
+ {ok, Log} = thrift_client:call(Client, getStruct, [1]),
io:format("Log: ~p~n", [Log]),
- Client6 =
- try
- Work1 = #work{op=?tutorial_DIVIDE,
- num1=1,
- num2=0},
- {ClientS1, {ok, _Quot}} = thrift_client:call(Client5, calculate, [2, Work1]),
+ try
+ Work1 = #work{op=?tutorial_DIVIDE,
+ num1=1,
+ num2=0},
+ {ok, _Quot} = thrift_client:call(Client, calculate, [2, Work1]),
- io:format("LAME: exception handling is broken~n", []),
- ClientS1
- catch
- throw:{ClientS2, Z} ->
- io:format("Got exception where expecting - the " ++
- "following is NOT a problem!!!~n"),
- p(Z),
- ClientS2
- end,
+ io:format("LAME: exception handling is broken~n", [])
+ catch
+ Z ->
+ io:format("Got exception where expecting - the " ++
+ "following is NOT a problem!!!~n"),
+ p(Z)
+ end,
- {Client7, {ok, ok}} = thrift_client:call(Client6, zip, []),
+ {ok, ok} = thrift_client:call(Client, zip, []),
io:format("zip~n", []),
- {_Client8, ok} = thrift_client:close(Client7),
+ ok = thrift_client:close(Client),
ok.