diff --git a/apps/aircon/src/aircon_app.erl b/apps/aircon/src/aircon_app.erl index bcc49d4..eeb64d6 100644 --- a/apps/aircon/src/aircon_app.erl +++ b/apps/aircon/src/aircon_app.erl @@ -10,9 +10,34 @@ -export([start/2, stop/1]). start(_StartType, _StartArgs) -> + start_logger(), aircon_sup:start_link(). stop(_State) -> ok. %% internal functions + +start_logger() -> + %filelib:ensure_dir("log/debug.log"), + + logger:add_handler( + disk, + logger_disk_log_h, + #{ + level => debug, + file => "log/debug.log", + size => 10485760, + max_no_files => 5, + formatter => {logger_formatter, #{template => "$time [$level] $message $metadata\n"}} + } + ), + + logger:add_handler( + default_console, + logger_std_h, + #{ + level => debug, + formatter => {logger_formatter, #{template => "$time [$level] $message $metadata\n"}} + } + ). \ No newline at end of file diff --git a/apps/aircon/src/aircon_mqtt_subscriber.erl b/apps/aircon/src/aircon_mqtt_subscriber.erl index 8108959..7fbff18 100644 --- a/apps/aircon/src/aircon_mqtt_subscriber.erl +++ b/apps/aircon/src/aircon_mqtt_subscriber.erl @@ -185,14 +185,16 @@ emqx_opts(ClientSuffix) when is_binary(ClientSuffix) -> -spec dispatch(DeviceMac :: binary(), Message :: binary()) -> no_return(). dispatch(DeviceMac, Message) when is_binary(DeviceMac), is_binary(Message) -> - case aircon_args:get_device_uuid(DeviceMac) of - error -> - logger:notice("[mqtt_subscriber] device_mac: ~p, device_uuid not found", [DeviceMac]); - {ok, DeviceUUID} -> - case aircon_device_sup:ensure_device_started(DeviceUUID) of - {ok, DevicePid} -> - aircon_device:metric_data(DevicePid, Message); - {error, Reason} -> - logger:notice("[mqtt_subscriber] start device get error: ~p", [Reason]) - end - end. \ No newline at end of file + logger:notice("[mqtt_subscriber] device_mac: ~p, device_uuid not found", [DeviceMac]), + ok. + %case aircon_args:get_device_uuid(DeviceMac) of + % error -> + % logger:notice("[mqtt_subscriber] device_mac: ~p, device_uuid not found", [DeviceMac]); + % {ok, DeviceUUID} -> + % case aircon_device_sup:ensure_device_started(DeviceUUID) of + % {ok, DevicePid} -> + % aircon_device:metric_data(DevicePid, Message); + % {error, Reason} -> + % logger:notice("[mqtt_subscriber] start device get error: ~p", [Reason]) + % end + %end. \ No newline at end of file diff --git a/apps/aircon/src/aircon_sup.erl b/apps/aircon/src/aircon_sup.erl index b4b6323..d45a3f0 100644 --- a/apps/aircon/src/aircon_sup.erl +++ b/apps/aircon/src/aircon_sup.erl @@ -36,23 +36,23 @@ init([]) -> RegisterName = read_service_name(), ChildSpecs = [ - %#{ - % id => 'efka_client', - % start => {'efka_client', start_link, [RegisterName, Host, Port]}, - % restart => permanent, - % shutdown => 2000, - % type => worker, - % modules => ['efka_client'] - %}, + #{ + id => 'efka_client', + start => {'efka_client', start_link, [RegisterName, Host, Port]}, + restart => permanent, + shutdown => 2000, + type => worker, + modules => ['efka_client'] + }, - %#{ - % id => 'aircon_args', - % start => {'aircon_args', start_link, []}, - % restart => permanent, - % shutdown => 2000, - % type => worker, - % modules => ['aircon_args'] - %}, + #{ + id => 'aircon_args', + start => {'aircon_args', start_link, []}, + restart => permanent, + shutdown => 2000, + type => worker, + modules => ['aircon_args'] + }, #{ id => aircon_logger, @@ -99,7 +99,7 @@ read_service_name() -> %% 获取配置的名称 RootDir = code:root_dir(), VersionFile = RootDir ++ "/.version", - logger:debug("[aircon_sup] version path is: ~p", [VersionFile]), + logger:info("[aircon_sup] version path is: ~p", [VersionFile]), case file:read_file(VersionFile) of {ok, RegisterName0} -> string:trim(RegisterName0); diff --git a/config/sys-dev.config b/config/sys-dev.config index 4af9efa..58358ee 100644 --- a/config/sys-dev.config +++ b/config/sys-dev.config @@ -14,24 +14,9 @@ ]}, {efka_server, [ - {host, "39.98.184.67"}, + {host, "118.178.229.213"}, {port, 3361} ]} - ]}, - - {logger, [ - {level, debug}, - {metadata, [device_id, request_id]}, - {handlers, [ - {default, logger_std_h, #{level => debug, - formatter => {logger_formatter, #{template => "$time [$level] $message $metadata\n"}}}}, - - {disk, logger_disk_log_h, #{level => debug, - file => "log/debug.log", - size => 10485760, - max_no_files => 5, - formatter => {logger_formatter, #{template => "$time [$level] $message $metadata\n"}}}} - ]} ]} ]. \ No newline at end of file diff --git a/config/sys-prod.config b/config/sys-prod.config index 0017c69..a16c10f 100644 --- a/config/sys-prod.config +++ b/config/sys-prod.config @@ -17,21 +17,5 @@ {host, "39.98.184.67"}, {port, 3361} ]} - ]}, - - {logger, [ - {level, debug}, - {metadata, [device_id, request_id]}, - {handlers, [ - {default, logger_std_h, #{level => info, - formatter => {logger_formatter, #{template => "$time [$level] $message $metadata\n"}}}}, - - {disk, logger_disk_log_h, #{level => debug, - file => "log/debug.log", - size => 10485760, - max_no_files => 5, - formatter => {logger_formatter, #{template => "$time [$level] $message $metadata\n"}}}} - ]} ]} - ].