diff --git a/src/emqttd_broker.erl b/src/emqttd_broker.erl index 0bc27afa1..2d53a1328 100644 --- a/src/emqttd_broker.erl +++ b/src/emqttd_broker.erl @@ -115,9 +115,6 @@ stop_tick(TRef) -> init([]) -> emqttd_time:seed(), ets:new(?BROKER_TAB, [set, public, named_table]), - % Create $SYS Topics - emqttd:create(topic, <<"$SYS/brokers">>), - [ok = create_topic(Topic) || Topic <- ?SYSTOP_BROKERS], % Tick {ok, #state{started_at = os:timestamp(), heartbeat = start_tick(1000, heartbeat), @@ -160,9 +157,6 @@ code_change(_OldVsn, State, _Extra) -> %% Internal functions %%-------------------------------------------------------------------- -create_topic(Topic) -> - emqttd:create(topic, emqttd_topic:systop(Topic)). - retain(brokers) -> Payload = list_to_binary(string:join([atom_to_list(N) || N <- emqttd_mnesia:running_nodes()], ",")), diff --git a/src/emqttd_metrics.erl b/src/emqttd_metrics.erl index 79bfa95db..651e5037a 100644 --- a/src/emqttd_metrics.erl +++ b/src/emqttd_metrics.erl @@ -243,7 +243,7 @@ init([]) -> % Init metrics [create_metric(Metric) || Metric <- Metrics], % $SYS Topics for metrics - [ok = emqttd:create(topic, metric_topic(Topic)) || {_, Topic} <- Metrics], + % [ok = emqttd:create(topic, metric_topic(Topic)) || {_, Topic} <- Metrics], % Tick to publish metrics {ok, #state{tick_tref = emqttd_broker:start_tick(tick)}, hibernate}. diff --git a/src/emqttd_stats.erl b/src/emqttd_stats.erl index 478313fd0..9ffc08299 100644 --- a/src/emqttd_stats.erl +++ b/src/emqttd_stats.erl @@ -122,7 +122,7 @@ init([]) -> Topics = ?SYSTOP_CLIENTS ++ ?SYSTOP_SESSIONS ++ ?SYSTOP_PUBSUB ++ ?SYSTOP_RETAINED, ets:insert(?STATS_TAB, [{Topic, 0} || Topic <- Topics]), % Create $SYS Topics - [ok = emqttd:create(topic, stats_topic(Topic)) || Topic <- Topics], + % [ok = emqttd:create(topic, stats_topic(Topic)) || Topic <- Topics], % Tick to publish stats {ok, #state{tick_tref = emqttd_broker:start_tick(tick)}, hibernate}.