Skip to content

Commit 12c0e97

Browse files
committed
use otp unix domain sockets
1 parent 6e91b57 commit 12c0e97

File tree

3 files changed

+7
-8
lines changed

3 files changed

+7
-8
lines changed

rebar.config

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
%% -*- erlang -*-
22
{deps,
33
[
4-
{exometer_core, ".*", {git, "git://github.com/Feuerlabs/exometer_core.git", "09c2a93"}},
5-
{afunix, ".*", {git, "git://github.com/tonyrog/afunix.git", "180eed9"}}
4+
{exometer_core, ".*", {git, "git://github.com/Feuerlabs/exometer_core.git", "09c2a93"}}
65
]}.
76

87
{erl_opts,

src/exometer_collectd.app.src

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
{vsn, git},
66
{registered, []},
77
{applications, [kernel, stdlib,
8-
lager, afunix, exometer_core]},
8+
lager, exometer_core]},
99
{included_applications, []},
1010
{env, []}
1111
]}.

src/exometer_report_collectd.erl

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ report_exometer_(Metric, DataPoint, Extra, Value,
247247
type_map = TypeMap} = St) ->
248248
case get_type(TypeMap, Extra, ets_key(Metric, DataPoint)) of
249249
error ->
250-
?log(warning,
250+
?log(warning,
251251
"Could not resolve ~p to a collectd type."
252252
"Update exometer_report_collectd -> type_map in app.config. "
253253
"Value lost~n", [ets_key(Metric, DataPoint)]),
@@ -262,9 +262,9 @@ report_exometer_(Metric, DataPoint, Extra, Value,
262262

263263
send_request(Sock, Request, Metric, DataPoint, Extra, Value,
264264
#st{read_timeout = TOut} = St) ->
265-
try afunix:send(Sock, Request) of
265+
try gen_tcp:send(Sock, Request) of
266266
ok ->
267-
case afunix:recv(Sock, 0, TOut) of
267+
case gen_tcp:recv(Sock, 0, TOut) of
268268
{ok, Bin} ->
269269
%% Parse the reply
270270
case parse_reply(Request, Bin, St) of
@@ -351,7 +351,7 @@ connect_collectd(St) ->
351351
end.
352352

353353
connect_collectd(SocketPath, ConnectTimeout) ->
354-
afunix:connect(SocketPath, [{active, false}, {mode, binary}], ConnectTimeout).
354+
gen_tcp:connect(SocketPath, [{active, false}, {mode, binary}], ConnectTimeout).
355355

356356
unix_time() ->
357357
datetime_to_unix_time(erlang:universaltime()).
@@ -422,7 +422,7 @@ get_type(TypeMap, Extra, Name) ->
422422

423423
maybe_reconnect_after(Socket) ->
424424
%% Close socket if open
425-
if Socket =/= undefined -> afunix:close(Socket);
425+
if Socket =/= undefined -> gen_tcp:close(Socket);
426426
true -> true
427427
end,
428428
prepare_reconnect().

0 commit comments

Comments
 (0)