Skip to content

Commit e1f9e33

Browse files
committed
use otp unix domain sockets
* Remove afunix
1 parent 6e91b57 commit e1f9e33

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
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: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@
9191
-define(UNIX_EPOCH, 62167219200).
9292

9393
exometer_init(Opts) ->
94-
?log(info, "exometer_report_collectd(~p): Starting~n", [Opts]),
94+
?log(info, "Exometer(~p): Starting~n", [Opts]),
9595
SockPath = get_opt(path, Opts, ?DEFAULT_PATH),
9696
ConnectTimeout = get_opt(connect_timeout, Opts, ?CONNECT_TIMEOUT),
9797
ReconnectInterval =
@@ -119,6 +119,7 @@ exometer_init(Opts) ->
119119
},
120120
case connect_collectd(SockPath, ConnectTimeout) of
121121
{ok, Sock} ->
122+
?log(info, "Exometer collectd connection succeeded"),
122123
{ok, St0#st{socket = Sock}};
123124
{error, _} = Error ->
124125
?log(warning, "Exometer collectd connection failed; ~p. Retry in ~p~n",
@@ -247,7 +248,7 @@ report_exometer_(Metric, DataPoint, Extra, Value,
247248
type_map = TypeMap} = St) ->
248249
case get_type(TypeMap, Extra, ets_key(Metric, DataPoint)) of
249250
error ->
250-
?log(warning,
251+
?log(warning,
251252
"Could not resolve ~p to a collectd type."
252253
"Update exometer_report_collectd -> type_map in app.config. "
253254
"Value lost~n", [ets_key(Metric, DataPoint)]),
@@ -262,9 +263,9 @@ report_exometer_(Metric, DataPoint, Extra, Value,
262263

263264
send_request(Sock, Request, Metric, DataPoint, Extra, Value,
264265
#st{read_timeout = TOut} = St) ->
265-
try afunix:send(Sock, Request) of
266+
try gen_tcp:send(Sock, Request) of
266267
ok ->
267-
case afunix:recv(Sock, 0, TOut) of
268+
case gen_tcp:recv(Sock, 0, TOut) of
268269
{ok, Bin} ->
269270
%% Parse the reply
270271
case parse_reply(Request, Bin, St) of
@@ -351,7 +352,7 @@ connect_collectd(St) ->
351352
end.
352353

353354
connect_collectd(SocketPath, ConnectTimeout) ->
354-
afunix:connect(SocketPath, [{active, false}, {mode, binary}], ConnectTimeout).
355+
gen_tcp:connect({local, SocketPath}, 0, [{active, false}, {mode, binary}, local], ConnectTimeout).
355356

356357
unix_time() ->
357358
datetime_to_unix_time(erlang:universaltime()).
@@ -422,7 +423,7 @@ get_type(TypeMap, Extra, Name) ->
422423

423424
maybe_reconnect_after(Socket) ->
424425
%% Close socket if open
425-
if Socket =/= undefined -> afunix:close(Socket);
426+
if Socket =/= undefined -> gen_tcp:close(Socket);
426427
true -> true
427428
end,
428429
prepare_reconnect().

0 commit comments

Comments
 (0)