starcalc
/
flm01
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[api] add wrappers for erlrrd:update and erlrrd:fetch

This commit is contained in:
Bart Van Der Meerssche 2011-03-29 08:08:09 +00:00
parent 304dbbb803
commit 4e9440acae
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
server/api/flukso/src/flukso.hrl
View File

@ -188,3 +188,10 @@ logger(Uid, Type, Message, Severity, ReqData) ->
list_to_binary(wrq:peer(ReqData)), list_to_binary(wrq:peer(ReqData)),
unix_time() unix_time()
]). ]).
% erlrrd wrappers
rrd_fetch(Path, RrdSensor, RrdStart, RrdEnd, RrdResolution) ->
erlrrd:fetch(erlrrd:c([[Path, [RrdSensor|".rrd"]], "AVERAGE", ["-s ", RrdStart], ["-e ", RrdEnd], ["-r ", RrdResolution]])).
rrd_update(Path, RrdSensor, RrdData) ->
erlrrd:update([Path, [RrdSensor|".rrd"], " ", RrdData]).

17
server/api/flukso/src/flukso_sensor_xyz.erl
View File

@ -121,7 +121,7 @@ to_json(ReqData, #state{rrdSensor = RrdSensor, rrdStart = RrdStart, rrdEnd = Rrd
%% debugging: io:format("~s~n", [erlrrd:c([[Path, [RrdSensor|".rrd"]], "AVERAGE", ["-s ", RrdStart], ["-e ", RrdEnd], ["-r ", RrdResolution]])]), %% debugging: io:format("~s~n", [erlrrd:c([[Path, [RrdSensor|".rrd"]], "AVERAGE", ["-s ", RrdStart], ["-e ", RrdEnd], ["-r ", RrdResolution]])]),
case erlrrd:fetch(erlrrd:c([[Path, [RrdSensor|".rrd"]], "AVERAGE", ["-s ", RrdStart], ["-e ", RrdEnd], ["-r ", RrdResolution]])) of case rrd_fetch(Path, RrdSensor, RrdStart, RrdEnd, RrdResolution) of
{ok, Response} -> {ok, Response} ->
Filtered = [re:split(X, "[:][ ]", [{return,list}]) || [X] <- Response, string:str(X, ":") == 11], Filtered = [re:split(X, "[:][ ]", [{return,list}]) || [X] <- Response, string:str(X, ":") == 11],
Datapoints = [[list_to_integer(X), round(list_to_float(Y) * RrdFactor)] || [X, Y] <- Filtered, string:len(Y) /= 3], Datapoints = [[list_to_integer(X), round(list_to_float(Y) * RrdFactor)] || [X, Y] <- Filtered, string:len(Y) /= 3],
@ -148,9 +148,7 @@ process_post(ReqData, #state{rrdSensor = RrdSensor} = State) ->
{data, Result} = mysql:execute(pool, sensor_props, [RrdSensor]), {data, Result} = mysql:execute(pool, sensor_props, [RrdSensor]),
[[Uid, _Device, Midnight]] = mysql:get_result_rows(Result), [[Uid, _Device, Midnight]] = mysql:get_result_rows(Result),
%debugging: io:format("~s~n", [[Path, [RrdSensor|".rrd"], " ", RrdData]]), case rrd_update(?BASE_PATH, RrdSensor, RrdData) of
case erlrrd:update([?BASE_PATH, [RrdSensor|".rrd"], " ", RrdData]) of
{ok, _RrdResponse} -> {ok, _RrdResponse} ->
RrdResponse = "ok", RrdResponse = "ok",
NewMidnight = update_night(RrdSensor, Uid, Midnight, LastTimestamp, ReqData), NewMidnight = update_night(RrdSensor, Uid, Midnight, LastTimestamp, ReqData),
@ -165,16 +163,18 @@ process_post(ReqData, #state{rrdSensor = RrdSensor} = State) ->
update_night(RrdSensor, Uid, Midnight, LastTimestamp, ReqData) when LastTimestamp > Midnight + 6 * ?HOUR -> update_night(RrdSensor, Uid, Midnight, LastTimestamp, ReqData) when LastTimestamp > Midnight + 6 * ?HOUR ->
LastMidnight = calculate_midnight(unix_time(), Uid), LastMidnight = calculate_midnight(unix_time(), Uid),
RrdStart = integer_to_list(LastMidnight + 2 * ?HOUR),
RrdEnd = integer_to_list(LastMidnight + 5 * ?HOUR),
RrdResolution = integer_to_list(?QUARTER),
case erlrrd:fetch(erlrrd:c([[?BASE_PATH, [RrdSensor|".rrd"]], "AVERAGE", ["-s ", integer_to_list(LastMidnight + 2 * ?HOUR)], ["-e ", integer_to_list(LastMidnight + 5 * ?HOUR)], ["-r ", integer_to_list(?QUARTER)]])) of case rrd_fetch(?BASE_PATH, RrdSensor, RrdStart, RrdEnd, RrdResolution) of
{ok, Response} -> {ok, Response} ->
Filtered = [re:split(X, "[:][ ]", [{return,list}]) || [X] <- Response, string:str(X, ":") == 11], Filtered = [re:split(X, "[:][ ]", [{return,list}]) || [X] <- Response, string:str(X, ":") == 11],
Datapoints = [list_to_float(Y) || [_X, Y] <- Filtered, string:len(Y) /= 3], Datapoints = [list_to_float(Y) || [_X, Y] <- Filtered, string:len(Y) /= 3],
NightAverage = lists:foldl(fun(X, Sum) -> X / 12 + Sum end, 0, Datapoints), NightAverage = lists:foldl(fun(X, Sum) -> X / 12 + Sum end, 0, Datapoints),
RrdData = [integer_to_list(LastMidnight + 5 * ?HOUR), ":", float_to_list(NightAverage)],
%debugging: io:format("~s~n", [[?NIGHT_PATH, [RrdSensor|".rrd"], " ", integer_to_list(LastMidnight + 5 * ?HOUR), ":", float_to_list(NightAverage)]]), rrd_update(?NIGHT_PATH, RrdSensor, RrdData);
erlrrd:update([?NIGHT_PATH, [RrdSensor|".rrd"], " ", integer_to_list(LastMidnight + 5 * ?HOUR), ":", float_to_list(NightAverage)]);
{error, Reason} -> {error, Reason} ->
logger(Uid, <<"rrdupdate.night">>, list_to_binary(Reason), ?ERROR, ReqData) logger(Uid, <<"rrdupdate.night">>, list_to_binary(Reason), ?ERROR, ReqData)
end, end,
@ -187,7 +187,6 @@ calculate_midnight(Timestamp, Uid) ->
{data, Result} = mysql:execute(pool, timezone, [Uid]), {data, Result} = mysql:execute(pool, timezone, [Uid]),
[[TimezoneChar8]] = mysql:get_result_rows(Result), [[TimezoneChar8]] = mysql:get_result_rows(Result),
Timezone = list_to_integer(binary_to_list(TimezoneChar8)), Timezone = list_to_integer(binary_to_list(TimezoneChar8)),
closest_midnight(trunc(Timestamp/?DAY + 1) * ?DAY - Timezone, Timestamp). closest_midnight(trunc(Timestamp/?DAY + 1) * ?DAY - Timezone, Timestamp).
closest_midnight(ProposedMidnight, Timestamp) when ProposedMidnight > Timestamp -> closest_midnight(ProposedMidnight, Timestamp) when ProposedMidnight > Timestamp ->