Merge pull request #14 from jrgdiz/jrgdiz/error_logger
Changes io:format output to error_logger
This commit is contained in:
@@ -15,14 +15,14 @@ make_app([AppDirAtom]) ->
|
|||||||
Modules = get_modules(AppDir),
|
Modules = get_modules(AppDir),
|
||||||
AppSrc = try get_app_src(AppDir)
|
AppSrc = try get_app_src(AppDir)
|
||||||
catch error:{badmatch, _} ->
|
catch error:{badmatch, _} ->
|
||||||
% io:format("Couldn't get AppSrcFile for ~p~n", [AppDir]),
|
% error_logger:error_msg("Couldn't get AppSrcFile for ~p~n", [AppDir]),
|
||||||
erlang:halt()
|
erlang:halt()
|
||||||
end,
|
end,
|
||||||
{application, Name, Opts} = AppSrc,
|
{application, Name, Opts} = AppSrc,
|
||||||
NewOpts = [ {modules, Modules} | Opts ],
|
NewOpts = [ {modules, Modules} | Opts ],
|
||||||
AppFile = filename:join([AppDir, "ebin", atom_to_list(Name) ++ ".app"]),
|
AppFile = filename:join([AppDir, "ebin", atom_to_list(Name) ++ ".app"]),
|
||||||
ok = file:write_file(AppFile, io_lib:format("~p.~n", [{application, Name, NewOpts}])),
|
ok = file:write_file(AppFile, io_lib:format("~p.~n", [{application, Name, NewOpts}])),
|
||||||
io:format("Wrote .app contents to: ~p~n", [AppFile]),
|
error_logger:info_msg("Wrote .app contents to: ~p~n", [AppFile]),
|
||||||
ok.
|
ok.
|
||||||
|
|
||||||
|
|
||||||
@@ -43,6 +43,6 @@ get_modules(AppDir) ->
|
|||||||
get_app_src(AppDir) ->
|
get_app_src(AppDir) ->
|
||||||
[AppSrcFile] = filelib:wildcard(filename:join([AppDir, "src", "*.app.src"])),
|
[AppSrcFile] = filelib:wildcard(filename:join([AppDir, "src", "*.app.src"])),
|
||||||
{ok, [AppSrc]} = file:consult(AppSrcFile),
|
{ok, [AppSrc]} = file:consult(AppSrcFile),
|
||||||
%io:format("AppSrc: ~p~n", [AppSrc]),
|
%error_logger:info_msg("AppSrc: ~p~n", [AppSrc]),
|
||||||
AppSrc.
|
AppSrc.
|
||||||
|
|
||||||
|
|||||||
@@ -110,7 +110,7 @@ create_tables(Filename) ->
|
|||||||
true = ets:insert(rule, Rules),
|
true = ets:insert(rule, Rules),
|
||||||
|
|
||||||
ets:new(flatzone, [duplicate_bag, named_table]),
|
ets:new(flatzone, [duplicate_bag, named_table]),
|
||||||
%% io:format("~p~n", [Rules]),
|
%% error_logger:info_msg("~p~n", [Rules]),
|
||||||
FlatZones = ezic_flatten:flatten(Zones, Rules),
|
FlatZones = ezic_flatten:flatten(Zones, Rules),
|
||||||
true = ets:insert(flatzone, FlatZones),
|
true = ets:insert(flatzone, FlatZones),
|
||||||
|
|
||||||
|
|||||||
@@ -139,7 +139,7 @@ create_tabs(ok) ->
|
|||||||
insert_all(Zones),
|
insert_all(Zones),
|
||||||
insert_all(Rules),
|
insert_all(Rules),
|
||||||
FlatZones = ezic_flatten:flatten(Zones, Rules),
|
FlatZones = ezic_flatten:flatten(Zones, Rules),
|
||||||
io:format("~p~n", [FlatZones]),
|
error_logger:info_msg("~p~n", [FlatZones]),
|
||||||
insert_all(FlatZones),
|
insert_all(FlatZones),
|
||||||
|
|
||||||
ok;
|
ok;
|
||||||
|
|||||||
@@ -53,9 +53,9 @@ ms(Date, Name) ->
|
|||||||
%% , utc_from=SDate, utc_to=SDate
|
%% , utc_from=SDate, utc_to=SDate
|
||||||
%% },
|
%% },
|
||||||
%% {ok, TestResult}= ets:test_ms(TestFZ, MS),
|
%% {ok, TestResult}= ets:test_ms(TestFZ, MS),
|
||||||
%% io:format("TestFZ: ~p~n", [TestFZ]),
|
%% error_logger:info_msg("TestFZ: ~p~n", [TestFZ]),
|
||||||
%% io:format("MS: ~p~n", [MS]),
|
%% error_logger:info_msg("MS: ~p~n", [MS]),
|
||||||
%% io:format("TestResult: ~p~n", [TestResult]),
|
%% error_logger:info_msg("TestResult: ~p~n", [TestResult]),
|
||||||
|
|
||||||
MS.
|
MS.
|
||||||
|
|
||||||
@@ -72,7 +72,7 @@ flatten_all_zones(AllZones, AllRules) ->
|
|||||||
flatten_all_zones([], _AllRules, FlatZones) ->
|
flatten_all_zones([], _AllRules, FlatZones) ->
|
||||||
FlatZones;
|
FlatZones;
|
||||||
flatten_all_zones([Z1|_]= AllZones, AllRules, FlatZones) ->
|
flatten_all_zones([Z1|_]= AllZones, AllRules, FlatZones) ->
|
||||||
io:format("Flattening zones: ~s~n", [Z1#zone.name]),
|
error_logger:info_msg("Flattening zones: ~s~n", [Z1#zone.name]),
|
||||||
{CurrentZones, RestZones}= ezic_zone:split_by_name(Z1, AllZones),
|
{CurrentZones, RestZones}= ezic_zone:split_by_name(Z1, AllZones),
|
||||||
Flats= flatten_zone_set(CurrentZones, AllRules),
|
Flats= flatten_zone_set(CurrentZones, AllRules),
|
||||||
flatten_all_zones(RestZones, AllRules, Flats ++ FlatZones).
|
flatten_all_zones(RestZones, AllRules, Flats ++ FlatZones).
|
||||||
@@ -231,7 +231,7 @@ flatten_rule_set(FlatStart=#flatzone{utc_from=UTCFrom, dstoffset=DSTOffset, offs
|
|||||||
end
|
end
|
||||||
catch
|
catch
|
||||||
error:{bad_year,Val} ->
|
error:{bad_year,Val} ->
|
||||||
io:format("bad year for EndingRule: ~p~n", [EndingRule]),
|
error_logger:error_msg("bad year for EndingRule: ~p~n", [EndingRule]),
|
||||||
erlang:error(bad_year, Val)
|
erlang:error(bad_year, Val)
|
||||||
end.
|
end.
|
||||||
|
|
||||||
|
|||||||
@@ -43,7 +43,7 @@ parse_dir(Dir) ->
|
|||||||
|
|
||||||
% returns a list of tzdata records from file
|
% returns a list of tzdata records from file
|
||||||
parse_file(File) ->
|
parse_file(File) ->
|
||||||
%% io:format("Parsing File: ~p~n", [File]),
|
%% error_logger:info_msg("Parsing File: ~p~n", [File]),
|
||||||
{ok, FD} = file:open(File, [read]),
|
{ok, FD} = file:open(File, [read]),
|
||||||
parse_lines(file:read_line(FD), FD, []).
|
parse_lines(file:read_line(FD), FD, []).
|
||||||
|
|
||||||
@@ -64,7 +64,7 @@ parse_lines({ok, Line}, File, Records) ->
|
|||||||
|
|
||||||
% the Line has data, so we parse it, build a record, and return it
|
% the Line has data, so we parse it, build a record, and return it
|
||||||
parse_to_record(Line, _, Records) ->
|
parse_to_record(Line, _, Records) ->
|
||||||
%% io:format(" Parsing Line: ~p~n", [Line]),
|
%% error_logger:info_msg(" Parsing Line: ~p~n", [Line]),
|
||||||
[Type | Data] = string:tokens(Line, " \t"),
|
[Type | Data] = string:tokens(Line, " \t"),
|
||||||
{ok, PrevType, PrevName} = prev_rec_type(Records),
|
{ok, PrevType, PrevName} = prev_rec_type(Records),
|
||||||
{ok, Record} = build_record(Type, Data, {PrevType, PrevName}),
|
{ok, Record} = build_record(Type, Data, {PrevType, PrevName}),
|
||||||
|
|||||||
Reference in New Issue
Block a user