From 1715b87dceb80a14d146471e3be682b4cf3a3840 Mon Sep 17 00:00:00 2001 From: Zaiming Shi Date: Thu, 3 Jun 2021 11:26:53 +0200 Subject: [PATCH 01/11] chore: move root level src, test, include, priv and etc to apps/emqx --- {etc => apps/emqx/etc}/BUILT_ON | 0 {etc => apps/emqx/etc}/acl.conf | 0 {etc => apps/emqx/etc}/acl.conf.paho | 0 {etc => apps/emqx/etc}/certs/README | 0 {etc => apps/emqx/etc}/certs/cacert.pem | 0 {etc => apps/emqx/etc}/certs/cert.pem | 0 {etc => apps/emqx/etc}/certs/client-cert.pem | 0 {etc => apps/emqx/etc}/certs/client-key.pem | 0 {etc => apps/emqx/etc}/certs/key.pem | 0 {etc => apps/emqx/etc}/emqx.conf | 0 {etc => apps/emqx/etc}/emqx_cloud/vm.args | 0 {etc => apps/emqx/etc}/emqx_edge/vm.args | 0 {etc => apps/emqx/etc}/ssl_dist.conf | 0 {include => apps/emqx/include}/emqx.hrl | 0 {include => apps/emqx/include}/emqx_mqtt.hrl | 0 .../emqx/include}/emqx_release.hrl | 0 {include => apps/emqx/include}/logger.hrl | 0 {include => apps/emqx/include}/types.hrl | 0 apps/emqx/rebar.config | 38 + apps/emqx/rebar.config.script | 11 + {src => apps/emqx/src}/emqx.app.src | 0 {src => apps/emqx/src}/emqx.appup.src | 0 {src => apps/emqx/src}/emqx.erl | 0 .../emqx/src}/emqx_access_control.erl | 0 {src => apps/emqx/src}/emqx_access_rule.erl | 0 {src => apps/emqx/src}/emqx_acl_cache.erl | 0 {src => apps/emqx/src}/emqx_alarm.erl | 0 {src => apps/emqx/src}/emqx_alarm_handler.erl | 0 {src => apps/emqx/src}/emqx_app.erl | 0 {src => apps/emqx/src}/emqx_banned.erl | 0 {src => apps/emqx/src}/emqx_base62.erl | 0 {src => apps/emqx/src}/emqx_batch.erl | 0 {src => apps/emqx/src}/emqx_boot.erl | 0 {src => apps/emqx/src}/emqx_broker.erl | 0 {src => apps/emqx/src}/emqx_broker_bench.erl | 0 {src => apps/emqx/src}/emqx_broker_helper.erl | 0 {src => apps/emqx/src}/emqx_broker_sup.erl | 0 {src => apps/emqx/src}/emqx_channel.erl | 0 {src => apps/emqx/src}/emqx_cm.erl | 0 {src => apps/emqx/src}/emqx_cm_locker.erl | 0 {src => apps/emqx/src}/emqx_cm_registry.erl | 0 {src => apps/emqx/src}/emqx_cm_sup.erl | 0 {src => apps/emqx/src}/emqx_congestion.erl | 0 {src => apps/emqx/src}/emqx_connection.erl | 0 {src => apps/emqx/src}/emqx_ctl.erl | 0 {src => apps/emqx/src}/emqx_flapping.erl | 0 {src => apps/emqx/src}/emqx_frame.erl | 0 {src => apps/emqx/src}/emqx_gc.erl | 0 {src => apps/emqx/src}/emqx_gen_mod.erl | 0 {src => apps/emqx/src}/emqx_global_gc.erl | 0 {src => apps/emqx/src}/emqx_guid.erl | 0 {src => apps/emqx/src}/emqx_hooks.erl | 0 {src => apps/emqx/src}/emqx_inflight.erl | 0 {src => apps/emqx/src}/emqx_json.erl | 0 {src => apps/emqx/src}/emqx_keepalive.erl | 0 {src => apps/emqx/src}/emqx_kernel_sup.erl | 0 {src => apps/emqx/src}/emqx_limiter.erl | 0 {src => apps/emqx/src}/emqx_listeners.erl | 0 {src => apps/emqx/src}/emqx_logger.erl | 0 .../emqx/src}/emqx_logger_jsonfmt.erl | 0 .../emqx/src}/emqx_logger_textfmt.erl | 0 {src => apps/emqx/src}/emqx_message.erl | 0 {src => apps/emqx/src}/emqx_metrics.erl | 0 {src => apps/emqx/src}/emqx_misc.erl | 0 {src => apps/emqx/src}/emqx_mountpoint.erl | 0 {src => apps/emqx/src}/emqx_mqtt_caps.erl | 0 {src => apps/emqx/src}/emqx_mqtt_props.erl | 0 {src => apps/emqx/src}/emqx_mqueue.erl | 0 {src => apps/emqx/src}/emqx_node_dump.erl | 0 {src => apps/emqx/src}/emqx_os_mon.erl | 0 {src => apps/emqx/src}/emqx_packet.erl | 0 {src => apps/emqx/src}/emqx_passwd.erl | 0 {src => apps/emqx/src}/emqx_pd.erl | 0 {src => apps/emqx/src}/emqx_plugins.erl | 0 {src => apps/emqx/src}/emqx_pmon.erl | 0 {src => apps/emqx/src}/emqx_pool.erl | 0 {src => apps/emqx/src}/emqx_pool_sup.erl | 0 {src => apps/emqx/src}/emqx_pqueue.erl | 0 {src => apps/emqx/src}/emqx_psk.erl | 0 {src => apps/emqx/src}/emqx_reason_codes.erl | 0 {src => apps/emqx/src}/emqx_router.erl | 0 {src => apps/emqx/src}/emqx_router_helper.erl | 0 {src => apps/emqx/src}/emqx_router_sup.erl | 0 {src => apps/emqx/src}/emqx_rpc.erl | 0 .../emqx/src}/emqx_rule_actions_trans.erl | 0 {src => apps/emqx/src}/emqx_schema.erl | 0 {src => apps/emqx/src}/emqx_sequence.erl | 0 {src => apps/emqx/src}/emqx_session.erl | 0 {src => apps/emqx/src}/emqx_shared_sub.erl | 0 {src => apps/emqx/src}/emqx_stats.erl | 0 {src => apps/emqx/src}/emqx_sup.erl | 0 {src => apps/emqx/src}/emqx_sys.erl | 0 {src => apps/emqx/src}/emqx_sys_mon.erl | 0 {src => apps/emqx/src}/emqx_sys_sup.erl | 0 {src => apps/emqx/src}/emqx_tables.erl | 0 {src => apps/emqx/src}/emqx_tls_lib.erl | 0 {src => apps/emqx/src}/emqx_topic.erl | 0 {src => apps/emqx/src}/emqx_tracer.erl | 0 {src => apps/emqx/src}/emqx_trie.erl | 0 {src => apps/emqx/src}/emqx_types.erl | 0 {src => apps/emqx/src}/emqx_vm.erl | 0 {src => apps/emqx/src}/emqx_vm_mon.erl | 0 {src => apps/emqx/src}/emqx_ws_connection.erl | 0 {src => apps/emqx/src}/emqx_zone.erl | 0 {test => apps/emqx/test}/emqx_SUITE.erl | 0 .../emqx/test}/emqx_SUITE_data/acl.conf | 0 .../emqx/test}/emqx_SUITE_data/loaded_modules | 0 .../emqx/test}/emqx_SUITE_data/loaded_plugins | 0 .../test}/emqx_access_SUITE_data/acl.conf | 0 .../acl_deny_action.conf | 0 .../emqx/test}/emqx_access_control_SUITE.erl | 0 .../emqx/test}/emqx_access_rule_SUITE.erl | 0 .../emqx/test}/emqx_acl_cache_SUITE.erl | 0 .../emqx/test}/emqx_acl_test_mod.erl | 0 {test => apps/emqx/test}/emqx_alarm_SUITE.erl | 0 .../emqx/test}/emqx_banned_SUITE.erl | 0 {test => apps/emqx/test}/emqx_batch_SUITE.erl | 0 {test => apps/emqx/test}/emqx_boot_SUITE.erl | 0 .../emqx/test}/emqx_broker_SUITE.erl | 0 .../emqx/test}/emqx_broker_helper_SUITE.erl | 0 .../emqx/test}/emqx_channel_SUITE.erl | 0 .../emqx/test}/emqx_client_SUITE.erl | 0 {test => apps/emqx/test}/emqx_cm_SUITE.erl | 0 .../emqx/test}/emqx_cm_locker_SUITE.erl | 0 .../emqx/test}/emqx_cm_registry_SUITE.erl | 0 .../emqx/test}/emqx_connection_SUITE.erl | 0 {test => apps/emqx/test}/emqx_ctl_SUITE.erl | 0 .../emqx/test}/emqx_flapping_SUITE.erl | 0 {test => apps/emqx/test}/emqx_frame_SUITE.erl | 0 {test => apps/emqx/test}/emqx_gc_SUITE.erl | 0 .../emqx/test}/emqx_global_gc_SUITE.erl | 0 {test => apps/emqx/test}/emqx_guid_SUITE.erl | 0 {test => apps/emqx/test}/emqx_hooks_SUITE.erl | 0 .../emqx/test}/emqx_inflight_SUITE.erl | 0 {test => apps/emqx/test}/emqx_json_SUITE.erl | 0 .../emqx/test}/emqx_keepalive_SUITE.erl | 0 .../emqx/test}/emqx_limiter_SUITE.erl | 0 .../emqx/test}/emqx_listeners_SUITE.erl | 0 .../emqx/test}/emqx_logger_SUITE.erl | 0 .../emqx/test}/emqx_message_SUITE.erl | 0 .../emqx/test}/emqx_metrics_SUITE.erl | 0 {test => apps/emqx/test}/emqx_misc_SUITE.erl | 0 .../emqx/test}/emqx_mountpoint_SUITE.erl | 0 {test => apps/emqx/test}/emqx_mqtt_SUITE.erl | 0 .../emqx/test}/emqx_mqtt_caps_SUITE.erl | 0 .../emqx/test}/emqx_mqtt_props_SUITE.erl | 0 .../test}/emqx_mqtt_protocol_v5_SUITE.erl | 0 .../emqx/test}/emqx_mqueue_SUITE.erl | 0 .../emqx/test}/emqx_os_mon_SUITE.erl | 0 .../emqx/test}/emqx_packet_SUITE.erl | 0 .../emqx/test}/emqx_passwd_SUITE.erl | 0 {test => apps/emqx/test}/emqx_pd_SUITE.erl | 0 .../emqx/test}/emqx_plugins_SUITE.erl | 0 .../emqx_mini_plugin/Makefile | 0 .../etc/emqx_mini_plugin.conf | 0 .../priv/emqx_mini_plugin.schema | 0 .../emqx_mini_plugin/rebar.config | 0 .../src/emqx_mini_plugin.app.src | 0 .../src/emqx_mini_plugin_app.erl | 0 {test => apps/emqx/test}/emqx_pmon_SUITE.erl | 0 {test => apps/emqx/test}/emqx_pool_SUITE.erl | 0 .../emqx/test}/emqx_pqueue_SUITE.erl | 0 .../emqx/test}/emqx_reason_codes_SUITE.erl | 0 .../emqx/test}/emqx_request_handler.erl | 0 .../test}/emqx_request_responser_SUITE.erl | 0 .../emqx/test}/emqx_request_sender.erl | 0 .../emqx/test}/emqx_router_SUITE.erl | 0 .../emqx/test}/emqx_router_helper_SUITE.erl | 0 .../emqx/test}/emqx_sequence_SUITE.erl | 0 .../emqx/test}/emqx_session_SUITE.erl | 0 .../emqx/test}/emqx_shared_sub_SUITE.erl | 0 {test => apps/emqx/test}/emqx_stats_SUITE.erl | 0 {test => apps/emqx/test}/emqx_sup_SUITE.erl | 0 {test => apps/emqx/test}/emqx_sys_SUITE.erl | 0 .../emqx/test}/emqx_sys_mon_SUITE.erl | 0 .../emqx/test}/emqx_tables_SUITE.erl | 0 .../emqx/test}/emqx_takeover_SUITE.erl | 0 .../emqx/test}/emqx_tls_lib_tests.erl | 0 {test => apps/emqx/test}/emqx_topic_SUITE.erl | 0 .../emqx/test}/emqx_tracer_SUITE.erl | 0 {test => apps/emqx/test}/emqx_trie_SUITE.erl | 0 {test => apps/emqx/test}/emqx_vm_SUITE.erl | 0 .../emqx/test}/emqx_vm_mon_SUITE.erl | 0 .../emqx/test}/emqx_ws_connection_SUITE.erl | 0 {test => apps/emqx/test}/emqx_zone_SUITE.erl | 0 .../emqx/test}/props/prop_emqx_base62.erl | 0 .../emqx/test}/props/prop_emqx_frame.erl | 0 .../emqx/test}/props/prop_emqx_json.erl | 0 .../emqx/test}/props/prop_emqx_psk.erl | 0 .../test}/props/prop_emqx_reason_codes.erl | 0 .../emqx/test}/props/prop_emqx_rpc.erl | 0 .../emqx/test}/props/prop_emqx_sys.erl | 0 pkg-vsn.sh | 2 +- priv/emqx.schema | 2513 ----------------- rebar.config | 4 - 195 files changed, 50 insertions(+), 2518 deletions(-) rename {etc => apps/emqx/etc}/BUILT_ON (100%) rename {etc => apps/emqx/etc}/acl.conf (100%) rename {etc => apps/emqx/etc}/acl.conf.paho (100%) rename {etc => apps/emqx/etc}/certs/README (100%) rename {etc => apps/emqx/etc}/certs/cacert.pem (100%) rename {etc => apps/emqx/etc}/certs/cert.pem (100%) rename {etc => apps/emqx/etc}/certs/client-cert.pem (100%) rename {etc => apps/emqx/etc}/certs/client-key.pem (100%) rename {etc => apps/emqx/etc}/certs/key.pem (100%) rename {etc => apps/emqx/etc}/emqx.conf (100%) rename {etc => apps/emqx/etc}/emqx_cloud/vm.args (100%) rename {etc => apps/emqx/etc}/emqx_edge/vm.args (100%) rename {etc => apps/emqx/etc}/ssl_dist.conf (100%) rename {include => apps/emqx/include}/emqx.hrl (100%) rename {include => apps/emqx/include}/emqx_mqtt.hrl (100%) rename {include => apps/emqx/include}/emqx_release.hrl (100%) rename {include => apps/emqx/include}/logger.hrl (100%) rename {include => apps/emqx/include}/types.hrl (100%) create mode 100644 apps/emqx/rebar.config create mode 100644 apps/emqx/rebar.config.script rename {src => apps/emqx/src}/emqx.app.src (100%) rename {src => apps/emqx/src}/emqx.appup.src (100%) rename {src => apps/emqx/src}/emqx.erl (100%) rename {src => apps/emqx/src}/emqx_access_control.erl (100%) rename {src => apps/emqx/src}/emqx_access_rule.erl (100%) rename {src => apps/emqx/src}/emqx_acl_cache.erl (100%) rename {src => apps/emqx/src}/emqx_alarm.erl (100%) rename {src => apps/emqx/src}/emqx_alarm_handler.erl (100%) rename {src => apps/emqx/src}/emqx_app.erl (100%) rename {src => apps/emqx/src}/emqx_banned.erl (100%) rename {src => apps/emqx/src}/emqx_base62.erl (100%) rename {src => apps/emqx/src}/emqx_batch.erl (100%) rename {src => apps/emqx/src}/emqx_boot.erl (100%) rename {src => apps/emqx/src}/emqx_broker.erl (100%) rename {src => apps/emqx/src}/emqx_broker_bench.erl (100%) rename {src => apps/emqx/src}/emqx_broker_helper.erl (100%) rename {src => apps/emqx/src}/emqx_broker_sup.erl (100%) rename {src => apps/emqx/src}/emqx_channel.erl (100%) rename {src => apps/emqx/src}/emqx_cm.erl (100%) rename {src => apps/emqx/src}/emqx_cm_locker.erl (100%) rename {src => apps/emqx/src}/emqx_cm_registry.erl (100%) rename {src => apps/emqx/src}/emqx_cm_sup.erl (100%) rename {src => apps/emqx/src}/emqx_congestion.erl (100%) rename {src => apps/emqx/src}/emqx_connection.erl (100%) rename {src => apps/emqx/src}/emqx_ctl.erl (100%) rename {src => apps/emqx/src}/emqx_flapping.erl (100%) rename {src => apps/emqx/src}/emqx_frame.erl (100%) rename {src => apps/emqx/src}/emqx_gc.erl (100%) rename {src => apps/emqx/src}/emqx_gen_mod.erl (100%) rename {src => apps/emqx/src}/emqx_global_gc.erl (100%) rename {src => apps/emqx/src}/emqx_guid.erl (100%) rename {src => apps/emqx/src}/emqx_hooks.erl (100%) rename {src => apps/emqx/src}/emqx_inflight.erl (100%) rename {src => apps/emqx/src}/emqx_json.erl (100%) rename {src => apps/emqx/src}/emqx_keepalive.erl (100%) rename {src => apps/emqx/src}/emqx_kernel_sup.erl (100%) rename {src => apps/emqx/src}/emqx_limiter.erl (100%) rename {src => apps/emqx/src}/emqx_listeners.erl (100%) rename {src => apps/emqx/src}/emqx_logger.erl (100%) rename {src => apps/emqx/src}/emqx_logger_jsonfmt.erl (100%) rename {src => apps/emqx/src}/emqx_logger_textfmt.erl (100%) rename {src => apps/emqx/src}/emqx_message.erl (100%) rename {src => apps/emqx/src}/emqx_metrics.erl (100%) rename {src => apps/emqx/src}/emqx_misc.erl (100%) rename {src => apps/emqx/src}/emqx_mountpoint.erl (100%) rename {src => apps/emqx/src}/emqx_mqtt_caps.erl (100%) rename {src => apps/emqx/src}/emqx_mqtt_props.erl (100%) rename {src => apps/emqx/src}/emqx_mqueue.erl (100%) rename {src => apps/emqx/src}/emqx_node_dump.erl (100%) rename {src => apps/emqx/src}/emqx_os_mon.erl (100%) rename {src => apps/emqx/src}/emqx_packet.erl (100%) rename {src => apps/emqx/src}/emqx_passwd.erl (100%) rename {src => apps/emqx/src}/emqx_pd.erl (100%) rename {src => apps/emqx/src}/emqx_plugins.erl (100%) rename {src => apps/emqx/src}/emqx_pmon.erl (100%) rename {src => apps/emqx/src}/emqx_pool.erl (100%) rename {src => apps/emqx/src}/emqx_pool_sup.erl (100%) rename {src => apps/emqx/src}/emqx_pqueue.erl (100%) rename {src => apps/emqx/src}/emqx_psk.erl (100%) rename {src => apps/emqx/src}/emqx_reason_codes.erl (100%) rename {src => apps/emqx/src}/emqx_router.erl (100%) rename {src => apps/emqx/src}/emqx_router_helper.erl (100%) rename {src => apps/emqx/src}/emqx_router_sup.erl (100%) rename {src => apps/emqx/src}/emqx_rpc.erl (100%) rename {src => apps/emqx/src}/emqx_rule_actions_trans.erl (100%) rename {src => apps/emqx/src}/emqx_schema.erl (100%) rename {src => apps/emqx/src}/emqx_sequence.erl (100%) rename {src => apps/emqx/src}/emqx_session.erl (100%) rename {src => apps/emqx/src}/emqx_shared_sub.erl (100%) rename {src => apps/emqx/src}/emqx_stats.erl (100%) rename {src => apps/emqx/src}/emqx_sup.erl (100%) rename {src => apps/emqx/src}/emqx_sys.erl (100%) rename {src => apps/emqx/src}/emqx_sys_mon.erl (100%) rename {src => apps/emqx/src}/emqx_sys_sup.erl (100%) rename {src => apps/emqx/src}/emqx_tables.erl (100%) rename {src => apps/emqx/src}/emqx_tls_lib.erl (100%) rename {src => apps/emqx/src}/emqx_topic.erl (100%) rename {src => apps/emqx/src}/emqx_tracer.erl (100%) rename {src => apps/emqx/src}/emqx_trie.erl (100%) rename {src => apps/emqx/src}/emqx_types.erl (100%) rename {src => apps/emqx/src}/emqx_vm.erl (100%) rename {src => apps/emqx/src}/emqx_vm_mon.erl (100%) rename {src => apps/emqx/src}/emqx_ws_connection.erl (100%) rename {src => apps/emqx/src}/emqx_zone.erl (100%) rename {test => apps/emqx/test}/emqx_SUITE.erl (100%) rename {test => apps/emqx/test}/emqx_SUITE_data/acl.conf (100%) rename {test => apps/emqx/test}/emqx_SUITE_data/loaded_modules (100%) rename {test => apps/emqx/test}/emqx_SUITE_data/loaded_plugins (100%) rename {test => apps/emqx/test}/emqx_access_SUITE_data/acl.conf (100%) rename {test => apps/emqx/test}/emqx_access_SUITE_data/acl_deny_action.conf (100%) rename {test => apps/emqx/test}/emqx_access_control_SUITE.erl (100%) rename {test => apps/emqx/test}/emqx_access_rule_SUITE.erl (100%) rename {test => apps/emqx/test}/emqx_acl_cache_SUITE.erl (100%) rename {test => apps/emqx/test}/emqx_acl_test_mod.erl (100%) rename {test => apps/emqx/test}/emqx_alarm_SUITE.erl (100%) rename {test => apps/emqx/test}/emqx_banned_SUITE.erl (100%) rename {test => apps/emqx/test}/emqx_batch_SUITE.erl (100%) rename {test => apps/emqx/test}/emqx_boot_SUITE.erl (100%) rename {test => apps/emqx/test}/emqx_broker_SUITE.erl (100%) rename {test => apps/emqx/test}/emqx_broker_helper_SUITE.erl (100%) rename {test => apps/emqx/test}/emqx_channel_SUITE.erl (100%) rename {test => apps/emqx/test}/emqx_client_SUITE.erl (100%) rename {test => apps/emqx/test}/emqx_cm_SUITE.erl (100%) rename {test => apps/emqx/test}/emqx_cm_locker_SUITE.erl (100%) rename {test => apps/emqx/test}/emqx_cm_registry_SUITE.erl (100%) rename {test => apps/emqx/test}/emqx_connection_SUITE.erl (100%) rename {test => apps/emqx/test}/emqx_ctl_SUITE.erl (100%) rename {test => apps/emqx/test}/emqx_flapping_SUITE.erl (100%) rename {test => apps/emqx/test}/emqx_frame_SUITE.erl (100%) rename {test => apps/emqx/test}/emqx_gc_SUITE.erl (100%) rename {test => apps/emqx/test}/emqx_global_gc_SUITE.erl (100%) rename {test => apps/emqx/test}/emqx_guid_SUITE.erl (100%) rename {test => apps/emqx/test}/emqx_hooks_SUITE.erl (100%) rename {test => apps/emqx/test}/emqx_inflight_SUITE.erl (100%) rename {test => apps/emqx/test}/emqx_json_SUITE.erl (100%) rename {test => apps/emqx/test}/emqx_keepalive_SUITE.erl (100%) rename {test => apps/emqx/test}/emqx_limiter_SUITE.erl (100%) rename {test => apps/emqx/test}/emqx_listeners_SUITE.erl (100%) rename {test => apps/emqx/test}/emqx_logger_SUITE.erl (100%) rename {test => apps/emqx/test}/emqx_message_SUITE.erl (100%) rename {test => apps/emqx/test}/emqx_metrics_SUITE.erl (100%) rename {test => apps/emqx/test}/emqx_misc_SUITE.erl (100%) rename {test => apps/emqx/test}/emqx_mountpoint_SUITE.erl (100%) rename {test => apps/emqx/test}/emqx_mqtt_SUITE.erl (100%) rename {test => apps/emqx/test}/emqx_mqtt_caps_SUITE.erl (100%) rename {test => apps/emqx/test}/emqx_mqtt_props_SUITE.erl (100%) rename {test => apps/emqx/test}/emqx_mqtt_protocol_v5_SUITE.erl (100%) rename {test => apps/emqx/test}/emqx_mqueue_SUITE.erl (100%) rename {test => apps/emqx/test}/emqx_os_mon_SUITE.erl (100%) rename {test => apps/emqx/test}/emqx_packet_SUITE.erl (100%) rename {test => apps/emqx/test}/emqx_passwd_SUITE.erl (100%) rename {test => apps/emqx/test}/emqx_pd_SUITE.erl (100%) rename {test => apps/emqx/test}/emqx_plugins_SUITE.erl (100%) rename {test => apps/emqx/test}/emqx_plugins_SUITE_data/emqx_mini_plugin/Makefile (100%) rename {test => apps/emqx/test}/emqx_plugins_SUITE_data/emqx_mini_plugin/etc/emqx_mini_plugin.conf (100%) rename {test => apps/emqx/test}/emqx_plugins_SUITE_data/emqx_mini_plugin/priv/emqx_mini_plugin.schema (100%) rename {test => apps/emqx/test}/emqx_plugins_SUITE_data/emqx_mini_plugin/rebar.config (100%) rename {test => apps/emqx/test}/emqx_plugins_SUITE_data/emqx_mini_plugin/src/emqx_mini_plugin.app.src (100%) rename {test => apps/emqx/test}/emqx_plugins_SUITE_data/emqx_mini_plugin/src/emqx_mini_plugin_app.erl (100%) rename {test => apps/emqx/test}/emqx_pmon_SUITE.erl (100%) rename {test => apps/emqx/test}/emqx_pool_SUITE.erl (100%) rename {test => apps/emqx/test}/emqx_pqueue_SUITE.erl (100%) rename {test => apps/emqx/test}/emqx_reason_codes_SUITE.erl (100%) rename {test => apps/emqx/test}/emqx_request_handler.erl (100%) rename {test => apps/emqx/test}/emqx_request_responser_SUITE.erl (100%) rename {test => apps/emqx/test}/emqx_request_sender.erl (100%) rename {test => apps/emqx/test}/emqx_router_SUITE.erl (100%) rename {test => apps/emqx/test}/emqx_router_helper_SUITE.erl (100%) rename {test => apps/emqx/test}/emqx_sequence_SUITE.erl (100%) rename {test => apps/emqx/test}/emqx_session_SUITE.erl (100%) rename {test => apps/emqx/test}/emqx_shared_sub_SUITE.erl (100%) rename {test => apps/emqx/test}/emqx_stats_SUITE.erl (100%) rename {test => apps/emqx/test}/emqx_sup_SUITE.erl (100%) rename {test => apps/emqx/test}/emqx_sys_SUITE.erl (100%) rename {test => apps/emqx/test}/emqx_sys_mon_SUITE.erl (100%) rename {test => apps/emqx/test}/emqx_tables_SUITE.erl (100%) rename {test => apps/emqx/test}/emqx_takeover_SUITE.erl (100%) rename {test => apps/emqx/test}/emqx_tls_lib_tests.erl (100%) rename {test => apps/emqx/test}/emqx_topic_SUITE.erl (100%) rename {test => apps/emqx/test}/emqx_tracer_SUITE.erl (100%) rename {test => apps/emqx/test}/emqx_trie_SUITE.erl (100%) rename {test => apps/emqx/test}/emqx_vm_SUITE.erl (100%) rename {test => apps/emqx/test}/emqx_vm_mon_SUITE.erl (100%) rename {test => apps/emqx/test}/emqx_ws_connection_SUITE.erl (100%) rename {test => apps/emqx/test}/emqx_zone_SUITE.erl (100%) rename {test => apps/emqx/test}/props/prop_emqx_base62.erl (100%) rename {test => apps/emqx/test}/props/prop_emqx_frame.erl (100%) rename {test => apps/emqx/test}/props/prop_emqx_json.erl (100%) rename {test => apps/emqx/test}/props/prop_emqx_psk.erl (100%) rename {test => apps/emqx/test}/props/prop_emqx_reason_codes.erl (100%) rename {test => apps/emqx/test}/props/prop_emqx_rpc.erl (100%) rename {test => apps/emqx/test}/props/prop_emqx_sys.erl (100%) delete mode 100644 priv/emqx.schema diff --git a/etc/BUILT_ON b/apps/emqx/etc/BUILT_ON similarity index 100% rename from etc/BUILT_ON rename to apps/emqx/etc/BUILT_ON diff --git a/etc/acl.conf b/apps/emqx/etc/acl.conf similarity index 100% rename from etc/acl.conf rename to apps/emqx/etc/acl.conf diff --git a/etc/acl.conf.paho b/apps/emqx/etc/acl.conf.paho similarity index 100% rename from etc/acl.conf.paho rename to apps/emqx/etc/acl.conf.paho diff --git a/etc/certs/README b/apps/emqx/etc/certs/README similarity index 100% rename from etc/certs/README rename to apps/emqx/etc/certs/README diff --git a/etc/certs/cacert.pem b/apps/emqx/etc/certs/cacert.pem similarity index 100% rename from etc/certs/cacert.pem rename to apps/emqx/etc/certs/cacert.pem diff --git a/etc/certs/cert.pem b/apps/emqx/etc/certs/cert.pem similarity index 100% rename from etc/certs/cert.pem rename to apps/emqx/etc/certs/cert.pem diff --git a/etc/certs/client-cert.pem b/apps/emqx/etc/certs/client-cert.pem similarity index 100% rename from etc/certs/client-cert.pem rename to apps/emqx/etc/certs/client-cert.pem diff --git a/etc/certs/client-key.pem b/apps/emqx/etc/certs/client-key.pem similarity index 100% rename from etc/certs/client-key.pem rename to apps/emqx/etc/certs/client-key.pem diff --git a/etc/certs/key.pem b/apps/emqx/etc/certs/key.pem similarity index 100% rename from etc/certs/key.pem rename to apps/emqx/etc/certs/key.pem diff --git a/etc/emqx.conf b/apps/emqx/etc/emqx.conf similarity index 100% rename from etc/emqx.conf rename to apps/emqx/etc/emqx.conf diff --git a/etc/emqx_cloud/vm.args b/apps/emqx/etc/emqx_cloud/vm.args similarity index 100% rename from etc/emqx_cloud/vm.args rename to apps/emqx/etc/emqx_cloud/vm.args diff --git a/etc/emqx_edge/vm.args b/apps/emqx/etc/emqx_edge/vm.args similarity index 100% rename from etc/emqx_edge/vm.args rename to apps/emqx/etc/emqx_edge/vm.args diff --git a/etc/ssl_dist.conf b/apps/emqx/etc/ssl_dist.conf similarity index 100% rename from etc/ssl_dist.conf rename to apps/emqx/etc/ssl_dist.conf diff --git a/include/emqx.hrl b/apps/emqx/include/emqx.hrl similarity index 100% rename from include/emqx.hrl rename to apps/emqx/include/emqx.hrl diff --git a/include/emqx_mqtt.hrl b/apps/emqx/include/emqx_mqtt.hrl similarity index 100% rename from include/emqx_mqtt.hrl rename to apps/emqx/include/emqx_mqtt.hrl diff --git a/include/emqx_release.hrl b/apps/emqx/include/emqx_release.hrl similarity index 100% rename from include/emqx_release.hrl rename to apps/emqx/include/emqx_release.hrl diff --git a/include/logger.hrl b/apps/emqx/include/logger.hrl similarity index 100% rename from include/logger.hrl rename to apps/emqx/include/logger.hrl diff --git a/include/types.hrl b/apps/emqx/include/types.hrl similarity index 100% rename from include/types.hrl rename to apps/emqx/include/types.hrl diff --git a/apps/emqx/rebar.config b/apps/emqx/rebar.config new file mode 100644 index 000000000..8eea43f6e --- /dev/null +++ b/apps/emqx/rebar.config @@ -0,0 +1,38 @@ +{erl_opts, [warn_unused_vars,warn_shadow_vars,warn_unused_import, + warn_obsolete_guard,compressed]}. + +{xref_checks,[undefined_function_calls,undefined_functions,locals_not_used, + deprecated_function_calls,warnings_as_errors,deprecated_functions]}. + +%% Deps here may duplicate with emqx.git root level rebar.config +%% but there not be any descrpancy. +%% This rebar.config is necessary because the app may be used as a +%% `git_subdir` dependency in other projects. +{deps, + [ {gproc, {git, "https://github.com/uwiger/gproc", {tag, "0.8.0"}}} + , {jiffy, {git, "https://github.com/emqx/jiffy", {tag, "1.0.5"}}} + , {cowboy, {git, "https://github.com/emqx/cowboy", {tag, "2.8.2"}}} + , {esockd, {git, "https://github.com/emqx/esockd", {tag, "5.8.0"}}} + , {ekka, {git, "https://github.com/emqx/ekka", {tag, "0.9.0"}}} + , {gen_rpc, {git, "https://github.com/emqx/gen_rpc", {tag, "2.5.1"}}} + , {cuttlefish, {git, "https://github.com/emqx/cuttlefish", {tag, "v4.0.1"}}} %% todo delete when plugins use hocon + , {hocon, {git, "https://github.com/emqx/hocon.git", {tag, "0.5.0"}}} + , {pbkdf2, {git, "https://github.com/emqx/erlang-pbkdf2.git", {branch, "2.0.4"}}} + , {emqtt, {git, "https://github.com/emqx/emqtt", {tag, "1.2.3.1"}}} + , {recon, {git, "https://github.com/ferd/recon", {tag, "2.5.1"}}} + , {snabbkaffe, {git, "https://github.com/kafka4beam/snabbkaffe.git", {tag, "0.13.0"}}} + ]}. + +{extra_src_dirs, [{"etc", [recursive]}]}. + +{profiles, [ + {test, + [{deps, + [ meck + , {bbmustache,"1.10.0"} + , {emqx_ct_helpers, {git,"https://github.com/zmstone/emqx-ct-helpers", {branch,"hocon"}}} + , {emqtt, {git, "https://github.com/emqx/emqtt", {tag, "1.2.3.1"}}} + ]}, + {extra_src_dirs, [{"test",[recursive]}]} + ]} +]}. diff --git a/apps/emqx/rebar.config.script b/apps/emqx/rebar.config.script new file mode 100644 index 000000000..eae18f106 --- /dev/null +++ b/apps/emqx/rebar.config.script @@ -0,0 +1,11 @@ +Bcrypt = {bcrypt, {git, "https://github.com/emqx/erlang-bcrypt.git", {branch, "0.6.0"}}}, +AddBcrypt = fun(C) -> + {deps, Deps0} = lists:keyfind(deps, 1, C), + Deps = [Bcrypt | Deps0], + lists:keystore(deps, 1, C, {deps, Deps}) +end, + +case os:type() of + {win32, _} -> CONFIG; + _ -> AddBcrypt(CONFIG) +end. diff --git a/src/emqx.app.src b/apps/emqx/src/emqx.app.src similarity index 100% rename from src/emqx.app.src rename to apps/emqx/src/emqx.app.src diff --git a/src/emqx.appup.src b/apps/emqx/src/emqx.appup.src similarity index 100% rename from src/emqx.appup.src rename to apps/emqx/src/emqx.appup.src diff --git a/src/emqx.erl b/apps/emqx/src/emqx.erl similarity index 100% rename from src/emqx.erl rename to apps/emqx/src/emqx.erl diff --git a/src/emqx_access_control.erl b/apps/emqx/src/emqx_access_control.erl similarity index 100% rename from src/emqx_access_control.erl rename to apps/emqx/src/emqx_access_control.erl diff --git a/src/emqx_access_rule.erl b/apps/emqx/src/emqx_access_rule.erl similarity index 100% rename from src/emqx_access_rule.erl rename to apps/emqx/src/emqx_access_rule.erl diff --git a/src/emqx_acl_cache.erl b/apps/emqx/src/emqx_acl_cache.erl similarity index 100% rename from src/emqx_acl_cache.erl rename to apps/emqx/src/emqx_acl_cache.erl diff --git a/src/emqx_alarm.erl b/apps/emqx/src/emqx_alarm.erl similarity index 100% rename from src/emqx_alarm.erl rename to apps/emqx/src/emqx_alarm.erl diff --git a/src/emqx_alarm_handler.erl b/apps/emqx/src/emqx_alarm_handler.erl similarity index 100% rename from src/emqx_alarm_handler.erl rename to apps/emqx/src/emqx_alarm_handler.erl diff --git a/src/emqx_app.erl b/apps/emqx/src/emqx_app.erl similarity index 100% rename from src/emqx_app.erl rename to apps/emqx/src/emqx_app.erl diff --git a/src/emqx_banned.erl b/apps/emqx/src/emqx_banned.erl similarity index 100% rename from src/emqx_banned.erl rename to apps/emqx/src/emqx_banned.erl diff --git a/src/emqx_base62.erl b/apps/emqx/src/emqx_base62.erl similarity index 100% rename from src/emqx_base62.erl rename to apps/emqx/src/emqx_base62.erl diff --git a/src/emqx_batch.erl b/apps/emqx/src/emqx_batch.erl similarity index 100% rename from src/emqx_batch.erl rename to apps/emqx/src/emqx_batch.erl diff --git a/src/emqx_boot.erl b/apps/emqx/src/emqx_boot.erl similarity index 100% rename from src/emqx_boot.erl rename to apps/emqx/src/emqx_boot.erl diff --git a/src/emqx_broker.erl b/apps/emqx/src/emqx_broker.erl similarity index 100% rename from src/emqx_broker.erl rename to apps/emqx/src/emqx_broker.erl diff --git a/src/emqx_broker_bench.erl b/apps/emqx/src/emqx_broker_bench.erl similarity index 100% rename from src/emqx_broker_bench.erl rename to apps/emqx/src/emqx_broker_bench.erl diff --git a/src/emqx_broker_helper.erl b/apps/emqx/src/emqx_broker_helper.erl similarity index 100% rename from src/emqx_broker_helper.erl rename to apps/emqx/src/emqx_broker_helper.erl diff --git a/src/emqx_broker_sup.erl b/apps/emqx/src/emqx_broker_sup.erl similarity index 100% rename from src/emqx_broker_sup.erl rename to apps/emqx/src/emqx_broker_sup.erl diff --git a/src/emqx_channel.erl b/apps/emqx/src/emqx_channel.erl similarity index 100% rename from src/emqx_channel.erl rename to apps/emqx/src/emqx_channel.erl diff --git a/src/emqx_cm.erl b/apps/emqx/src/emqx_cm.erl similarity index 100% rename from src/emqx_cm.erl rename to apps/emqx/src/emqx_cm.erl diff --git a/src/emqx_cm_locker.erl b/apps/emqx/src/emqx_cm_locker.erl similarity index 100% rename from src/emqx_cm_locker.erl rename to apps/emqx/src/emqx_cm_locker.erl diff --git a/src/emqx_cm_registry.erl b/apps/emqx/src/emqx_cm_registry.erl similarity index 100% rename from src/emqx_cm_registry.erl rename to apps/emqx/src/emqx_cm_registry.erl diff --git a/src/emqx_cm_sup.erl b/apps/emqx/src/emqx_cm_sup.erl similarity index 100% rename from src/emqx_cm_sup.erl rename to apps/emqx/src/emqx_cm_sup.erl diff --git a/src/emqx_congestion.erl b/apps/emqx/src/emqx_congestion.erl similarity index 100% rename from src/emqx_congestion.erl rename to apps/emqx/src/emqx_congestion.erl diff --git a/src/emqx_connection.erl b/apps/emqx/src/emqx_connection.erl similarity index 100% rename from src/emqx_connection.erl rename to apps/emqx/src/emqx_connection.erl diff --git a/src/emqx_ctl.erl b/apps/emqx/src/emqx_ctl.erl similarity index 100% rename from src/emqx_ctl.erl rename to apps/emqx/src/emqx_ctl.erl diff --git a/src/emqx_flapping.erl b/apps/emqx/src/emqx_flapping.erl similarity index 100% rename from src/emqx_flapping.erl rename to apps/emqx/src/emqx_flapping.erl diff --git a/src/emqx_frame.erl b/apps/emqx/src/emqx_frame.erl similarity index 100% rename from src/emqx_frame.erl rename to apps/emqx/src/emqx_frame.erl diff --git a/src/emqx_gc.erl b/apps/emqx/src/emqx_gc.erl similarity index 100% rename from src/emqx_gc.erl rename to apps/emqx/src/emqx_gc.erl diff --git a/src/emqx_gen_mod.erl b/apps/emqx/src/emqx_gen_mod.erl similarity index 100% rename from src/emqx_gen_mod.erl rename to apps/emqx/src/emqx_gen_mod.erl diff --git a/src/emqx_global_gc.erl b/apps/emqx/src/emqx_global_gc.erl similarity index 100% rename from src/emqx_global_gc.erl rename to apps/emqx/src/emqx_global_gc.erl diff --git a/src/emqx_guid.erl b/apps/emqx/src/emqx_guid.erl similarity index 100% rename from src/emqx_guid.erl rename to apps/emqx/src/emqx_guid.erl diff --git a/src/emqx_hooks.erl b/apps/emqx/src/emqx_hooks.erl similarity index 100% rename from src/emqx_hooks.erl rename to apps/emqx/src/emqx_hooks.erl diff --git a/src/emqx_inflight.erl b/apps/emqx/src/emqx_inflight.erl similarity index 100% rename from src/emqx_inflight.erl rename to apps/emqx/src/emqx_inflight.erl diff --git a/src/emqx_json.erl b/apps/emqx/src/emqx_json.erl similarity index 100% rename from src/emqx_json.erl rename to apps/emqx/src/emqx_json.erl diff --git a/src/emqx_keepalive.erl b/apps/emqx/src/emqx_keepalive.erl similarity index 100% rename from src/emqx_keepalive.erl rename to apps/emqx/src/emqx_keepalive.erl diff --git a/src/emqx_kernel_sup.erl b/apps/emqx/src/emqx_kernel_sup.erl similarity index 100% rename from src/emqx_kernel_sup.erl rename to apps/emqx/src/emqx_kernel_sup.erl diff --git a/src/emqx_limiter.erl b/apps/emqx/src/emqx_limiter.erl similarity index 100% rename from src/emqx_limiter.erl rename to apps/emqx/src/emqx_limiter.erl diff --git a/src/emqx_listeners.erl b/apps/emqx/src/emqx_listeners.erl similarity index 100% rename from src/emqx_listeners.erl rename to apps/emqx/src/emqx_listeners.erl diff --git a/src/emqx_logger.erl b/apps/emqx/src/emqx_logger.erl similarity index 100% rename from src/emqx_logger.erl rename to apps/emqx/src/emqx_logger.erl diff --git a/src/emqx_logger_jsonfmt.erl b/apps/emqx/src/emqx_logger_jsonfmt.erl similarity index 100% rename from src/emqx_logger_jsonfmt.erl rename to apps/emqx/src/emqx_logger_jsonfmt.erl diff --git a/src/emqx_logger_textfmt.erl b/apps/emqx/src/emqx_logger_textfmt.erl similarity index 100% rename from src/emqx_logger_textfmt.erl rename to apps/emqx/src/emqx_logger_textfmt.erl diff --git a/src/emqx_message.erl b/apps/emqx/src/emqx_message.erl similarity index 100% rename from src/emqx_message.erl rename to apps/emqx/src/emqx_message.erl diff --git a/src/emqx_metrics.erl b/apps/emqx/src/emqx_metrics.erl similarity index 100% rename from src/emqx_metrics.erl rename to apps/emqx/src/emqx_metrics.erl diff --git a/src/emqx_misc.erl b/apps/emqx/src/emqx_misc.erl similarity index 100% rename from src/emqx_misc.erl rename to apps/emqx/src/emqx_misc.erl diff --git a/src/emqx_mountpoint.erl b/apps/emqx/src/emqx_mountpoint.erl similarity index 100% rename from src/emqx_mountpoint.erl rename to apps/emqx/src/emqx_mountpoint.erl diff --git a/src/emqx_mqtt_caps.erl b/apps/emqx/src/emqx_mqtt_caps.erl similarity index 100% rename from src/emqx_mqtt_caps.erl rename to apps/emqx/src/emqx_mqtt_caps.erl diff --git a/src/emqx_mqtt_props.erl b/apps/emqx/src/emqx_mqtt_props.erl similarity index 100% rename from src/emqx_mqtt_props.erl rename to apps/emqx/src/emqx_mqtt_props.erl diff --git a/src/emqx_mqueue.erl b/apps/emqx/src/emqx_mqueue.erl similarity index 100% rename from src/emqx_mqueue.erl rename to apps/emqx/src/emqx_mqueue.erl diff --git a/src/emqx_node_dump.erl b/apps/emqx/src/emqx_node_dump.erl similarity index 100% rename from src/emqx_node_dump.erl rename to apps/emqx/src/emqx_node_dump.erl diff --git a/src/emqx_os_mon.erl b/apps/emqx/src/emqx_os_mon.erl similarity index 100% rename from src/emqx_os_mon.erl rename to apps/emqx/src/emqx_os_mon.erl diff --git a/src/emqx_packet.erl b/apps/emqx/src/emqx_packet.erl similarity index 100% rename from src/emqx_packet.erl rename to apps/emqx/src/emqx_packet.erl diff --git a/src/emqx_passwd.erl b/apps/emqx/src/emqx_passwd.erl similarity index 100% rename from src/emqx_passwd.erl rename to apps/emqx/src/emqx_passwd.erl diff --git a/src/emqx_pd.erl b/apps/emqx/src/emqx_pd.erl similarity index 100% rename from src/emqx_pd.erl rename to apps/emqx/src/emqx_pd.erl diff --git a/src/emqx_plugins.erl b/apps/emqx/src/emqx_plugins.erl similarity index 100% rename from src/emqx_plugins.erl rename to apps/emqx/src/emqx_plugins.erl diff --git a/src/emqx_pmon.erl b/apps/emqx/src/emqx_pmon.erl similarity index 100% rename from src/emqx_pmon.erl rename to apps/emqx/src/emqx_pmon.erl diff --git a/src/emqx_pool.erl b/apps/emqx/src/emqx_pool.erl similarity index 100% rename from src/emqx_pool.erl rename to apps/emqx/src/emqx_pool.erl diff --git a/src/emqx_pool_sup.erl b/apps/emqx/src/emqx_pool_sup.erl similarity index 100% rename from src/emqx_pool_sup.erl rename to apps/emqx/src/emqx_pool_sup.erl diff --git a/src/emqx_pqueue.erl b/apps/emqx/src/emqx_pqueue.erl similarity index 100% rename from src/emqx_pqueue.erl rename to apps/emqx/src/emqx_pqueue.erl diff --git a/src/emqx_psk.erl b/apps/emqx/src/emqx_psk.erl similarity index 100% rename from src/emqx_psk.erl rename to apps/emqx/src/emqx_psk.erl diff --git a/src/emqx_reason_codes.erl b/apps/emqx/src/emqx_reason_codes.erl similarity index 100% rename from src/emqx_reason_codes.erl rename to apps/emqx/src/emqx_reason_codes.erl diff --git a/src/emqx_router.erl b/apps/emqx/src/emqx_router.erl similarity index 100% rename from src/emqx_router.erl rename to apps/emqx/src/emqx_router.erl diff --git a/src/emqx_router_helper.erl b/apps/emqx/src/emqx_router_helper.erl similarity index 100% rename from src/emqx_router_helper.erl rename to apps/emqx/src/emqx_router_helper.erl diff --git a/src/emqx_router_sup.erl b/apps/emqx/src/emqx_router_sup.erl similarity index 100% rename from src/emqx_router_sup.erl rename to apps/emqx/src/emqx_router_sup.erl diff --git a/src/emqx_rpc.erl b/apps/emqx/src/emqx_rpc.erl similarity index 100% rename from src/emqx_rpc.erl rename to apps/emqx/src/emqx_rpc.erl diff --git a/src/emqx_rule_actions_trans.erl b/apps/emqx/src/emqx_rule_actions_trans.erl similarity index 100% rename from src/emqx_rule_actions_trans.erl rename to apps/emqx/src/emqx_rule_actions_trans.erl diff --git a/src/emqx_schema.erl b/apps/emqx/src/emqx_schema.erl similarity index 100% rename from src/emqx_schema.erl rename to apps/emqx/src/emqx_schema.erl diff --git a/src/emqx_sequence.erl b/apps/emqx/src/emqx_sequence.erl similarity index 100% rename from src/emqx_sequence.erl rename to apps/emqx/src/emqx_sequence.erl diff --git a/src/emqx_session.erl b/apps/emqx/src/emqx_session.erl similarity index 100% rename from src/emqx_session.erl rename to apps/emqx/src/emqx_session.erl diff --git a/src/emqx_shared_sub.erl b/apps/emqx/src/emqx_shared_sub.erl similarity index 100% rename from src/emqx_shared_sub.erl rename to apps/emqx/src/emqx_shared_sub.erl diff --git a/src/emqx_stats.erl b/apps/emqx/src/emqx_stats.erl similarity index 100% rename from src/emqx_stats.erl rename to apps/emqx/src/emqx_stats.erl diff --git a/src/emqx_sup.erl b/apps/emqx/src/emqx_sup.erl similarity index 100% rename from src/emqx_sup.erl rename to apps/emqx/src/emqx_sup.erl diff --git a/src/emqx_sys.erl b/apps/emqx/src/emqx_sys.erl similarity index 100% rename from src/emqx_sys.erl rename to apps/emqx/src/emqx_sys.erl diff --git a/src/emqx_sys_mon.erl b/apps/emqx/src/emqx_sys_mon.erl similarity index 100% rename from src/emqx_sys_mon.erl rename to apps/emqx/src/emqx_sys_mon.erl diff --git a/src/emqx_sys_sup.erl b/apps/emqx/src/emqx_sys_sup.erl similarity index 100% rename from src/emqx_sys_sup.erl rename to apps/emqx/src/emqx_sys_sup.erl diff --git a/src/emqx_tables.erl b/apps/emqx/src/emqx_tables.erl similarity index 100% rename from src/emqx_tables.erl rename to apps/emqx/src/emqx_tables.erl diff --git a/src/emqx_tls_lib.erl b/apps/emqx/src/emqx_tls_lib.erl similarity index 100% rename from src/emqx_tls_lib.erl rename to apps/emqx/src/emqx_tls_lib.erl diff --git a/src/emqx_topic.erl b/apps/emqx/src/emqx_topic.erl similarity index 100% rename from src/emqx_topic.erl rename to apps/emqx/src/emqx_topic.erl diff --git a/src/emqx_tracer.erl b/apps/emqx/src/emqx_tracer.erl similarity index 100% rename from src/emqx_tracer.erl rename to apps/emqx/src/emqx_tracer.erl diff --git a/src/emqx_trie.erl b/apps/emqx/src/emqx_trie.erl similarity index 100% rename from src/emqx_trie.erl rename to apps/emqx/src/emqx_trie.erl diff --git a/src/emqx_types.erl b/apps/emqx/src/emqx_types.erl similarity index 100% rename from src/emqx_types.erl rename to apps/emqx/src/emqx_types.erl diff --git a/src/emqx_vm.erl b/apps/emqx/src/emqx_vm.erl similarity index 100% rename from src/emqx_vm.erl rename to apps/emqx/src/emqx_vm.erl diff --git a/src/emqx_vm_mon.erl b/apps/emqx/src/emqx_vm_mon.erl similarity index 100% rename from src/emqx_vm_mon.erl rename to apps/emqx/src/emqx_vm_mon.erl diff --git a/src/emqx_ws_connection.erl b/apps/emqx/src/emqx_ws_connection.erl similarity index 100% rename from src/emqx_ws_connection.erl rename to apps/emqx/src/emqx_ws_connection.erl diff --git a/src/emqx_zone.erl b/apps/emqx/src/emqx_zone.erl similarity index 100% rename from src/emqx_zone.erl rename to apps/emqx/src/emqx_zone.erl diff --git a/test/emqx_SUITE.erl b/apps/emqx/test/emqx_SUITE.erl similarity index 100% rename from test/emqx_SUITE.erl rename to apps/emqx/test/emqx_SUITE.erl diff --git a/test/emqx_SUITE_data/acl.conf b/apps/emqx/test/emqx_SUITE_data/acl.conf similarity index 100% rename from test/emqx_SUITE_data/acl.conf rename to apps/emqx/test/emqx_SUITE_data/acl.conf diff --git a/test/emqx_SUITE_data/loaded_modules b/apps/emqx/test/emqx_SUITE_data/loaded_modules similarity index 100% rename from test/emqx_SUITE_data/loaded_modules rename to apps/emqx/test/emqx_SUITE_data/loaded_modules diff --git a/test/emqx_SUITE_data/loaded_plugins b/apps/emqx/test/emqx_SUITE_data/loaded_plugins similarity index 100% rename from test/emqx_SUITE_data/loaded_plugins rename to apps/emqx/test/emqx_SUITE_data/loaded_plugins diff --git a/test/emqx_access_SUITE_data/acl.conf b/apps/emqx/test/emqx_access_SUITE_data/acl.conf similarity index 100% rename from test/emqx_access_SUITE_data/acl.conf rename to apps/emqx/test/emqx_access_SUITE_data/acl.conf diff --git a/test/emqx_access_SUITE_data/acl_deny_action.conf b/apps/emqx/test/emqx_access_SUITE_data/acl_deny_action.conf similarity index 100% rename from test/emqx_access_SUITE_data/acl_deny_action.conf rename to apps/emqx/test/emqx_access_SUITE_data/acl_deny_action.conf diff --git a/test/emqx_access_control_SUITE.erl b/apps/emqx/test/emqx_access_control_SUITE.erl similarity index 100% rename from test/emqx_access_control_SUITE.erl rename to apps/emqx/test/emqx_access_control_SUITE.erl diff --git a/test/emqx_access_rule_SUITE.erl b/apps/emqx/test/emqx_access_rule_SUITE.erl similarity index 100% rename from test/emqx_access_rule_SUITE.erl rename to apps/emqx/test/emqx_access_rule_SUITE.erl diff --git a/test/emqx_acl_cache_SUITE.erl b/apps/emqx/test/emqx_acl_cache_SUITE.erl similarity index 100% rename from test/emqx_acl_cache_SUITE.erl rename to apps/emqx/test/emqx_acl_cache_SUITE.erl diff --git a/test/emqx_acl_test_mod.erl b/apps/emqx/test/emqx_acl_test_mod.erl similarity index 100% rename from test/emqx_acl_test_mod.erl rename to apps/emqx/test/emqx_acl_test_mod.erl diff --git a/test/emqx_alarm_SUITE.erl b/apps/emqx/test/emqx_alarm_SUITE.erl similarity index 100% rename from test/emqx_alarm_SUITE.erl rename to apps/emqx/test/emqx_alarm_SUITE.erl diff --git a/test/emqx_banned_SUITE.erl b/apps/emqx/test/emqx_banned_SUITE.erl similarity index 100% rename from test/emqx_banned_SUITE.erl rename to apps/emqx/test/emqx_banned_SUITE.erl diff --git a/test/emqx_batch_SUITE.erl b/apps/emqx/test/emqx_batch_SUITE.erl similarity index 100% rename from test/emqx_batch_SUITE.erl rename to apps/emqx/test/emqx_batch_SUITE.erl diff --git a/test/emqx_boot_SUITE.erl b/apps/emqx/test/emqx_boot_SUITE.erl similarity index 100% rename from test/emqx_boot_SUITE.erl rename to apps/emqx/test/emqx_boot_SUITE.erl diff --git a/test/emqx_broker_SUITE.erl b/apps/emqx/test/emqx_broker_SUITE.erl similarity index 100% rename from test/emqx_broker_SUITE.erl rename to apps/emqx/test/emqx_broker_SUITE.erl diff --git a/test/emqx_broker_helper_SUITE.erl b/apps/emqx/test/emqx_broker_helper_SUITE.erl similarity index 100% rename from test/emqx_broker_helper_SUITE.erl rename to apps/emqx/test/emqx_broker_helper_SUITE.erl diff --git a/test/emqx_channel_SUITE.erl b/apps/emqx/test/emqx_channel_SUITE.erl similarity index 100% rename from test/emqx_channel_SUITE.erl rename to apps/emqx/test/emqx_channel_SUITE.erl diff --git a/test/emqx_client_SUITE.erl b/apps/emqx/test/emqx_client_SUITE.erl similarity index 100% rename from test/emqx_client_SUITE.erl rename to apps/emqx/test/emqx_client_SUITE.erl diff --git a/test/emqx_cm_SUITE.erl b/apps/emqx/test/emqx_cm_SUITE.erl similarity index 100% rename from test/emqx_cm_SUITE.erl rename to apps/emqx/test/emqx_cm_SUITE.erl diff --git a/test/emqx_cm_locker_SUITE.erl b/apps/emqx/test/emqx_cm_locker_SUITE.erl similarity index 100% rename from test/emqx_cm_locker_SUITE.erl rename to apps/emqx/test/emqx_cm_locker_SUITE.erl diff --git a/test/emqx_cm_registry_SUITE.erl b/apps/emqx/test/emqx_cm_registry_SUITE.erl similarity index 100% rename from test/emqx_cm_registry_SUITE.erl rename to apps/emqx/test/emqx_cm_registry_SUITE.erl diff --git a/test/emqx_connection_SUITE.erl b/apps/emqx/test/emqx_connection_SUITE.erl similarity index 100% rename from test/emqx_connection_SUITE.erl rename to apps/emqx/test/emqx_connection_SUITE.erl diff --git a/test/emqx_ctl_SUITE.erl b/apps/emqx/test/emqx_ctl_SUITE.erl similarity index 100% rename from test/emqx_ctl_SUITE.erl rename to apps/emqx/test/emqx_ctl_SUITE.erl diff --git a/test/emqx_flapping_SUITE.erl b/apps/emqx/test/emqx_flapping_SUITE.erl similarity index 100% rename from test/emqx_flapping_SUITE.erl rename to apps/emqx/test/emqx_flapping_SUITE.erl diff --git a/test/emqx_frame_SUITE.erl b/apps/emqx/test/emqx_frame_SUITE.erl similarity index 100% rename from test/emqx_frame_SUITE.erl rename to apps/emqx/test/emqx_frame_SUITE.erl diff --git a/test/emqx_gc_SUITE.erl b/apps/emqx/test/emqx_gc_SUITE.erl similarity index 100% rename from test/emqx_gc_SUITE.erl rename to apps/emqx/test/emqx_gc_SUITE.erl diff --git a/test/emqx_global_gc_SUITE.erl b/apps/emqx/test/emqx_global_gc_SUITE.erl similarity index 100% rename from test/emqx_global_gc_SUITE.erl rename to apps/emqx/test/emqx_global_gc_SUITE.erl diff --git a/test/emqx_guid_SUITE.erl b/apps/emqx/test/emqx_guid_SUITE.erl similarity index 100% rename from test/emqx_guid_SUITE.erl rename to apps/emqx/test/emqx_guid_SUITE.erl diff --git a/test/emqx_hooks_SUITE.erl b/apps/emqx/test/emqx_hooks_SUITE.erl similarity index 100% rename from test/emqx_hooks_SUITE.erl rename to apps/emqx/test/emqx_hooks_SUITE.erl diff --git a/test/emqx_inflight_SUITE.erl b/apps/emqx/test/emqx_inflight_SUITE.erl similarity index 100% rename from test/emqx_inflight_SUITE.erl rename to apps/emqx/test/emqx_inflight_SUITE.erl diff --git a/test/emqx_json_SUITE.erl b/apps/emqx/test/emqx_json_SUITE.erl similarity index 100% rename from test/emqx_json_SUITE.erl rename to apps/emqx/test/emqx_json_SUITE.erl diff --git a/test/emqx_keepalive_SUITE.erl b/apps/emqx/test/emqx_keepalive_SUITE.erl similarity index 100% rename from test/emqx_keepalive_SUITE.erl rename to apps/emqx/test/emqx_keepalive_SUITE.erl diff --git a/test/emqx_limiter_SUITE.erl b/apps/emqx/test/emqx_limiter_SUITE.erl similarity index 100% rename from test/emqx_limiter_SUITE.erl rename to apps/emqx/test/emqx_limiter_SUITE.erl diff --git a/test/emqx_listeners_SUITE.erl b/apps/emqx/test/emqx_listeners_SUITE.erl similarity index 100% rename from test/emqx_listeners_SUITE.erl rename to apps/emqx/test/emqx_listeners_SUITE.erl diff --git a/test/emqx_logger_SUITE.erl b/apps/emqx/test/emqx_logger_SUITE.erl similarity index 100% rename from test/emqx_logger_SUITE.erl rename to apps/emqx/test/emqx_logger_SUITE.erl diff --git a/test/emqx_message_SUITE.erl b/apps/emqx/test/emqx_message_SUITE.erl similarity index 100% rename from test/emqx_message_SUITE.erl rename to apps/emqx/test/emqx_message_SUITE.erl diff --git a/test/emqx_metrics_SUITE.erl b/apps/emqx/test/emqx_metrics_SUITE.erl similarity index 100% rename from test/emqx_metrics_SUITE.erl rename to apps/emqx/test/emqx_metrics_SUITE.erl diff --git a/test/emqx_misc_SUITE.erl b/apps/emqx/test/emqx_misc_SUITE.erl similarity index 100% rename from test/emqx_misc_SUITE.erl rename to apps/emqx/test/emqx_misc_SUITE.erl diff --git a/test/emqx_mountpoint_SUITE.erl b/apps/emqx/test/emqx_mountpoint_SUITE.erl similarity index 100% rename from test/emqx_mountpoint_SUITE.erl rename to apps/emqx/test/emqx_mountpoint_SUITE.erl diff --git a/test/emqx_mqtt_SUITE.erl b/apps/emqx/test/emqx_mqtt_SUITE.erl similarity index 100% rename from test/emqx_mqtt_SUITE.erl rename to apps/emqx/test/emqx_mqtt_SUITE.erl diff --git a/test/emqx_mqtt_caps_SUITE.erl b/apps/emqx/test/emqx_mqtt_caps_SUITE.erl similarity index 100% rename from test/emqx_mqtt_caps_SUITE.erl rename to apps/emqx/test/emqx_mqtt_caps_SUITE.erl diff --git a/test/emqx_mqtt_props_SUITE.erl b/apps/emqx/test/emqx_mqtt_props_SUITE.erl similarity index 100% rename from test/emqx_mqtt_props_SUITE.erl rename to apps/emqx/test/emqx_mqtt_props_SUITE.erl diff --git a/test/emqx_mqtt_protocol_v5_SUITE.erl b/apps/emqx/test/emqx_mqtt_protocol_v5_SUITE.erl similarity index 100% rename from test/emqx_mqtt_protocol_v5_SUITE.erl rename to apps/emqx/test/emqx_mqtt_protocol_v5_SUITE.erl diff --git a/test/emqx_mqueue_SUITE.erl b/apps/emqx/test/emqx_mqueue_SUITE.erl similarity index 100% rename from test/emqx_mqueue_SUITE.erl rename to apps/emqx/test/emqx_mqueue_SUITE.erl diff --git a/test/emqx_os_mon_SUITE.erl b/apps/emqx/test/emqx_os_mon_SUITE.erl similarity index 100% rename from test/emqx_os_mon_SUITE.erl rename to apps/emqx/test/emqx_os_mon_SUITE.erl diff --git a/test/emqx_packet_SUITE.erl b/apps/emqx/test/emqx_packet_SUITE.erl similarity index 100% rename from test/emqx_packet_SUITE.erl rename to apps/emqx/test/emqx_packet_SUITE.erl diff --git a/test/emqx_passwd_SUITE.erl b/apps/emqx/test/emqx_passwd_SUITE.erl similarity index 100% rename from test/emqx_passwd_SUITE.erl rename to apps/emqx/test/emqx_passwd_SUITE.erl diff --git a/test/emqx_pd_SUITE.erl b/apps/emqx/test/emqx_pd_SUITE.erl similarity index 100% rename from test/emqx_pd_SUITE.erl rename to apps/emqx/test/emqx_pd_SUITE.erl diff --git a/test/emqx_plugins_SUITE.erl b/apps/emqx/test/emqx_plugins_SUITE.erl similarity index 100% rename from test/emqx_plugins_SUITE.erl rename to apps/emqx/test/emqx_plugins_SUITE.erl diff --git a/test/emqx_plugins_SUITE_data/emqx_mini_plugin/Makefile b/apps/emqx/test/emqx_plugins_SUITE_data/emqx_mini_plugin/Makefile similarity index 100% rename from test/emqx_plugins_SUITE_data/emqx_mini_plugin/Makefile rename to apps/emqx/test/emqx_plugins_SUITE_data/emqx_mini_plugin/Makefile diff --git a/test/emqx_plugins_SUITE_data/emqx_mini_plugin/etc/emqx_mini_plugin.conf b/apps/emqx/test/emqx_plugins_SUITE_data/emqx_mini_plugin/etc/emqx_mini_plugin.conf similarity index 100% rename from test/emqx_plugins_SUITE_data/emqx_mini_plugin/etc/emqx_mini_plugin.conf rename to apps/emqx/test/emqx_plugins_SUITE_data/emqx_mini_plugin/etc/emqx_mini_plugin.conf diff --git a/test/emqx_plugins_SUITE_data/emqx_mini_plugin/priv/emqx_mini_plugin.schema b/apps/emqx/test/emqx_plugins_SUITE_data/emqx_mini_plugin/priv/emqx_mini_plugin.schema similarity index 100% rename from test/emqx_plugins_SUITE_data/emqx_mini_plugin/priv/emqx_mini_plugin.schema rename to apps/emqx/test/emqx_plugins_SUITE_data/emqx_mini_plugin/priv/emqx_mini_plugin.schema diff --git a/test/emqx_plugins_SUITE_data/emqx_mini_plugin/rebar.config b/apps/emqx/test/emqx_plugins_SUITE_data/emqx_mini_plugin/rebar.config similarity index 100% rename from test/emqx_plugins_SUITE_data/emqx_mini_plugin/rebar.config rename to apps/emqx/test/emqx_plugins_SUITE_data/emqx_mini_plugin/rebar.config diff --git a/test/emqx_plugins_SUITE_data/emqx_mini_plugin/src/emqx_mini_plugin.app.src b/apps/emqx/test/emqx_plugins_SUITE_data/emqx_mini_plugin/src/emqx_mini_plugin.app.src similarity index 100% rename from test/emqx_plugins_SUITE_data/emqx_mini_plugin/src/emqx_mini_plugin.app.src rename to apps/emqx/test/emqx_plugins_SUITE_data/emqx_mini_plugin/src/emqx_mini_plugin.app.src diff --git a/test/emqx_plugins_SUITE_data/emqx_mini_plugin/src/emqx_mini_plugin_app.erl b/apps/emqx/test/emqx_plugins_SUITE_data/emqx_mini_plugin/src/emqx_mini_plugin_app.erl similarity index 100% rename from test/emqx_plugins_SUITE_data/emqx_mini_plugin/src/emqx_mini_plugin_app.erl rename to apps/emqx/test/emqx_plugins_SUITE_data/emqx_mini_plugin/src/emqx_mini_plugin_app.erl diff --git a/test/emqx_pmon_SUITE.erl b/apps/emqx/test/emqx_pmon_SUITE.erl similarity index 100% rename from test/emqx_pmon_SUITE.erl rename to apps/emqx/test/emqx_pmon_SUITE.erl diff --git a/test/emqx_pool_SUITE.erl b/apps/emqx/test/emqx_pool_SUITE.erl similarity index 100% rename from test/emqx_pool_SUITE.erl rename to apps/emqx/test/emqx_pool_SUITE.erl diff --git a/test/emqx_pqueue_SUITE.erl b/apps/emqx/test/emqx_pqueue_SUITE.erl similarity index 100% rename from test/emqx_pqueue_SUITE.erl rename to apps/emqx/test/emqx_pqueue_SUITE.erl diff --git a/test/emqx_reason_codes_SUITE.erl b/apps/emqx/test/emqx_reason_codes_SUITE.erl similarity index 100% rename from test/emqx_reason_codes_SUITE.erl rename to apps/emqx/test/emqx_reason_codes_SUITE.erl diff --git a/test/emqx_request_handler.erl b/apps/emqx/test/emqx_request_handler.erl similarity index 100% rename from test/emqx_request_handler.erl rename to apps/emqx/test/emqx_request_handler.erl diff --git a/test/emqx_request_responser_SUITE.erl b/apps/emqx/test/emqx_request_responser_SUITE.erl similarity index 100% rename from test/emqx_request_responser_SUITE.erl rename to apps/emqx/test/emqx_request_responser_SUITE.erl diff --git a/test/emqx_request_sender.erl b/apps/emqx/test/emqx_request_sender.erl similarity index 100% rename from test/emqx_request_sender.erl rename to apps/emqx/test/emqx_request_sender.erl diff --git a/test/emqx_router_SUITE.erl b/apps/emqx/test/emqx_router_SUITE.erl similarity index 100% rename from test/emqx_router_SUITE.erl rename to apps/emqx/test/emqx_router_SUITE.erl diff --git a/test/emqx_router_helper_SUITE.erl b/apps/emqx/test/emqx_router_helper_SUITE.erl similarity index 100% rename from test/emqx_router_helper_SUITE.erl rename to apps/emqx/test/emqx_router_helper_SUITE.erl diff --git a/test/emqx_sequence_SUITE.erl b/apps/emqx/test/emqx_sequence_SUITE.erl similarity index 100% rename from test/emqx_sequence_SUITE.erl rename to apps/emqx/test/emqx_sequence_SUITE.erl diff --git a/test/emqx_session_SUITE.erl b/apps/emqx/test/emqx_session_SUITE.erl similarity index 100% rename from test/emqx_session_SUITE.erl rename to apps/emqx/test/emqx_session_SUITE.erl diff --git a/test/emqx_shared_sub_SUITE.erl b/apps/emqx/test/emqx_shared_sub_SUITE.erl similarity index 100% rename from test/emqx_shared_sub_SUITE.erl rename to apps/emqx/test/emqx_shared_sub_SUITE.erl diff --git a/test/emqx_stats_SUITE.erl b/apps/emqx/test/emqx_stats_SUITE.erl similarity index 100% rename from test/emqx_stats_SUITE.erl rename to apps/emqx/test/emqx_stats_SUITE.erl diff --git a/test/emqx_sup_SUITE.erl b/apps/emqx/test/emqx_sup_SUITE.erl similarity index 100% rename from test/emqx_sup_SUITE.erl rename to apps/emqx/test/emqx_sup_SUITE.erl diff --git a/test/emqx_sys_SUITE.erl b/apps/emqx/test/emqx_sys_SUITE.erl similarity index 100% rename from test/emqx_sys_SUITE.erl rename to apps/emqx/test/emqx_sys_SUITE.erl diff --git a/test/emqx_sys_mon_SUITE.erl b/apps/emqx/test/emqx_sys_mon_SUITE.erl similarity index 100% rename from test/emqx_sys_mon_SUITE.erl rename to apps/emqx/test/emqx_sys_mon_SUITE.erl diff --git a/test/emqx_tables_SUITE.erl b/apps/emqx/test/emqx_tables_SUITE.erl similarity index 100% rename from test/emqx_tables_SUITE.erl rename to apps/emqx/test/emqx_tables_SUITE.erl diff --git a/test/emqx_takeover_SUITE.erl b/apps/emqx/test/emqx_takeover_SUITE.erl similarity index 100% rename from test/emqx_takeover_SUITE.erl rename to apps/emqx/test/emqx_takeover_SUITE.erl diff --git a/test/emqx_tls_lib_tests.erl b/apps/emqx/test/emqx_tls_lib_tests.erl similarity index 100% rename from test/emqx_tls_lib_tests.erl rename to apps/emqx/test/emqx_tls_lib_tests.erl diff --git a/test/emqx_topic_SUITE.erl b/apps/emqx/test/emqx_topic_SUITE.erl similarity index 100% rename from test/emqx_topic_SUITE.erl rename to apps/emqx/test/emqx_topic_SUITE.erl diff --git a/test/emqx_tracer_SUITE.erl b/apps/emqx/test/emqx_tracer_SUITE.erl similarity index 100% rename from test/emqx_tracer_SUITE.erl rename to apps/emqx/test/emqx_tracer_SUITE.erl diff --git a/test/emqx_trie_SUITE.erl b/apps/emqx/test/emqx_trie_SUITE.erl similarity index 100% rename from test/emqx_trie_SUITE.erl rename to apps/emqx/test/emqx_trie_SUITE.erl diff --git a/test/emqx_vm_SUITE.erl b/apps/emqx/test/emqx_vm_SUITE.erl similarity index 100% rename from test/emqx_vm_SUITE.erl rename to apps/emqx/test/emqx_vm_SUITE.erl diff --git a/test/emqx_vm_mon_SUITE.erl b/apps/emqx/test/emqx_vm_mon_SUITE.erl similarity index 100% rename from test/emqx_vm_mon_SUITE.erl rename to apps/emqx/test/emqx_vm_mon_SUITE.erl diff --git a/test/emqx_ws_connection_SUITE.erl b/apps/emqx/test/emqx_ws_connection_SUITE.erl similarity index 100% rename from test/emqx_ws_connection_SUITE.erl rename to apps/emqx/test/emqx_ws_connection_SUITE.erl diff --git a/test/emqx_zone_SUITE.erl b/apps/emqx/test/emqx_zone_SUITE.erl similarity index 100% rename from test/emqx_zone_SUITE.erl rename to apps/emqx/test/emqx_zone_SUITE.erl diff --git a/test/props/prop_emqx_base62.erl b/apps/emqx/test/props/prop_emqx_base62.erl similarity index 100% rename from test/props/prop_emqx_base62.erl rename to apps/emqx/test/props/prop_emqx_base62.erl diff --git a/test/props/prop_emqx_frame.erl b/apps/emqx/test/props/prop_emqx_frame.erl similarity index 100% rename from test/props/prop_emqx_frame.erl rename to apps/emqx/test/props/prop_emqx_frame.erl diff --git a/test/props/prop_emqx_json.erl b/apps/emqx/test/props/prop_emqx_json.erl similarity index 100% rename from test/props/prop_emqx_json.erl rename to apps/emqx/test/props/prop_emqx_json.erl diff --git a/test/props/prop_emqx_psk.erl b/apps/emqx/test/props/prop_emqx_psk.erl similarity index 100% rename from test/props/prop_emqx_psk.erl rename to apps/emqx/test/props/prop_emqx_psk.erl diff --git a/test/props/prop_emqx_reason_codes.erl b/apps/emqx/test/props/prop_emqx_reason_codes.erl similarity index 100% rename from test/props/prop_emqx_reason_codes.erl rename to apps/emqx/test/props/prop_emqx_reason_codes.erl diff --git a/test/props/prop_emqx_rpc.erl b/apps/emqx/test/props/prop_emqx_rpc.erl similarity index 100% rename from test/props/prop_emqx_rpc.erl rename to apps/emqx/test/props/prop_emqx_rpc.erl diff --git a/test/props/prop_emqx_sys.erl b/apps/emqx/test/props/prop_emqx_sys.erl similarity index 100% rename from test/props/prop_emqx_sys.erl rename to apps/emqx/test/props/prop_emqx_sys.erl diff --git a/pkg-vsn.sh b/pkg-vsn.sh index 904690ad1..72bdb2850 100755 --- a/pkg-vsn.sh +++ b/pkg-vsn.sh @@ -13,7 +13,7 @@ else fi ## emqx_release.hrl is the single source of truth for release version -RELEASE="$(grep -E "define.+EMQX_RELEASE.+${EDITION}" include/emqx_release.hrl | cut -d '"' -f2)" +RELEASE="$(grep -E "define.+EMQX_RELEASE.+${EDITION}" apps/emqx/include/emqx_release.hrl | cut -d '"' -f2)" ## git commit hash is added as suffix in case the git tag and release version is not an exact match if [ -d .git ] && ! git describe --tags --match "[e|v]${RELEASE}" --exact >/dev/null 2>&1; then diff --git a/priv/emqx.schema b/priv/emqx.schema deleted file mode 100644 index 04970a150..000000000 --- a/priv/emqx.schema +++ /dev/null @@ -1,2513 +0,0 @@ -%%-*- mode: erlang -*- -%% EMQ X R4.0 config mapping - -%%-------------------------------------------------------------------- -%% Cluster -%%-------------------------------------------------------------------- - -%% @doc Cluster name -{mapping, "cluster.name", "ekka.cluster_name", [ - {default, emqxcl}, - {datatype, atom} -]}. - -%% @doc Cluster discovery -{mapping, "cluster.discovery", "ekka.cluster_discovery", [ - {default, manual}, - {datatype, atom} -]}. - -%% @doc Clean down node from the cluster -{mapping, "cluster.autoclean", "ekka.cluster_autoclean", [ - {datatype, {duration, ms}} -]}. - -%% @doc Cluster autoheal -{mapping, "cluster.autoheal", "ekka.cluster_autoheal", [ - {datatype, flag}, - {default, off} -]}. - -%%-------------------------------------------------------------------- -%% Cluster by static node list - -{mapping, "cluster.static.seeds", "ekka.cluster_discovery", [ - {datatype, string} -]}. - -%%-------------------------------------------------------------------- -%% Cluster by UDP Multicast - -{mapping, "cluster.mcast.addr", "ekka.cluster_discovery", [ - {default, "239.192.0.1"}, - {datatype, string} -]}. - -{mapping, "cluster.mcast.ports", "ekka.cluster_discovery", [ - {default, "4369"}, - {datatype, string} -]}. - -{mapping, "cluster.mcast.iface", "ekka.cluster_discovery", [ - {datatype, string}, - {default, "0.0.0.0"} -]}. - -{mapping, "cluster.mcast.ttl", "ekka.cluster_discovery", [ - {datatype, integer}, - {default, 255} -]}. - -{mapping, "cluster.mcast.loop", "ekka.cluster_discovery", [ - {datatype, flag}, - {default, on} -]}. - -{mapping, "cluster.mcast.sndbuf", "ekka.cluster_discovery", [ - {datatype, bytesize}, - {default, "16KB"} -]}. - -{mapping, "cluster.mcast.recbuf", "ekka.cluster_discovery", [ - {datatype, bytesize}, - {default, "16KB"} -]}. - -{mapping, "cluster.mcast.buffer", "ekka.cluster_discovery", [ - {datatype, bytesize}, - {default, "32KB"} -]}. - -%%-------------------------------------------------------------------- -%% Cluster by DNS A Record - -{mapping, "cluster.dns.name", "ekka.cluster_discovery", [ - {datatype, string} -]}. - -%% @doc The erlang distributed protocol -{mapping, "cluster.proto_dist", "ekka.proto_dist", [ - {default, "inet_tcp"}, - {datatype, {enum, [inet_tcp, inet6_tcp, inet_tls]}}, - hidden -]}. - -{mapping, "cluster.dns.app", "ekka.cluster_discovery", [ - {datatype, string} -]}. - -%%-------------------------------------------------------------------- -%% Cluster using etcd - -{mapping, "cluster.etcd.server", "ekka.cluster_discovery", [ - {datatype, string} -]}. - -{mapping, "cluster.etcd.version", "ekka.cluster_discovery", [ - {datatype, {enum, [v2, v3]}} -]}. - -{mapping, "cluster.etcd.prefix", "ekka.cluster_discovery", [ - {datatype, string} -]}. - -{mapping, "cluster.etcd.node_ttl", "ekka.cluster_discovery", [ - {datatype, {duration, ms}}, - {default, "1m"} -]}. - -{mapping, "cluster.etcd.ssl.keyfile", "ekka.cluster_discovery", [ - {datatype, string} -]}. - -{mapping, "cluster.etcd.ssl.certfile", "ekka.cluster_discovery", [ - {datatype, string} -]}. - -{mapping, "cluster.etcd.ssl.cacertfile", "ekka.cluster_discovery", [ - {datatype, string} -]}. - -%%-------------------------------------------------------------------- -%% Cluster on K8s - -{mapping, "cluster.k8s.apiserver", "ekka.cluster_discovery", [ - {datatype, string} -]}. - -{mapping, "cluster.k8s.service_name", "ekka.cluster_discovery", [ - {datatype, string} -]}. - -{mapping, "cluster.k8s.address_type", "ekka.cluster_discovery", [ - {datatype, {enum, [ip, dns, hostname]}} -]}. - -{mapping, "cluster.k8s.app_name", "ekka.cluster_discovery", [ - {datatype, string} -]}. - -{mapping, "cluster.k8s.namespace", "ekka.cluster_discovery", [ - {datatype, string} -]}. - -{mapping, "cluster.k8s.suffix", "ekka.cluster_discovery", [ - {datatype, string}, - {default, ""} - ]}. - -{translation, "ekka.cluster_discovery", fun(Conf) -> - Strategy = cuttlefish:conf_get("cluster.discovery", Conf), - Filter = fun(Opts) -> [{K, V} || {K, V} <- Opts, V =/= undefined] end, - IpPort = fun(S) -> - [Addr, Port] = string:tokens(S, ":"), - {ok, Ip} = inet:parse_address(Addr), - {Ip, Port} - end, - Options = fun(static) -> - [{seeds, [list_to_atom(S) || S <- string:tokens(cuttlefish:conf_get("cluster.static.seeds", Conf, ""), ",")]}]; - (mcast) -> - {ok, Addr} = inet:parse_address(cuttlefish:conf_get("cluster.mcast.addr", Conf)), - {ok, Iface} = inet:parse_address(cuttlefish:conf_get("cluster.mcast.iface", Conf)), - Ports = [list_to_integer(S) || S <- string:tokens(cuttlefish:conf_get("cluster.mcast.ports", Conf), ",")], - [{addr, Addr}, {ports, Ports}, {iface, Iface}, - {ttl, cuttlefish:conf_get("cluster.mcast.ttl", Conf, 1)}, - {loop, cuttlefish:conf_get("cluster.mcast.loop", Conf, true)}]; - (dns) -> - [{name, cuttlefish:conf_get("cluster.dns.name", Conf)}, - {app, cuttlefish:conf_get("cluster.dns.app", Conf)}]; - (etcd) -> - SslOpts = fun(Conf) -> - Options = cuttlefish_variable:filter_by_prefix("cluster.etcd.ssl", Conf), - lists:map(fun({["cluster", "etcd", "ssl", Name], Value}) -> - {list_to_atom(Name), Value} - end, Options) - end, - [{server, string:tokens(cuttlefish:conf_get("cluster.etcd.server", Conf), ",")}, - {version, cuttlefish:conf_get("cluster.etcd.version", Conf, v3)}, - {prefix, cuttlefish:conf_get("cluster.etcd.prefix", Conf, "emqcl")}, - {node_ttl, cuttlefish:conf_get("cluster.etcd.node_ttl", Conf, 60)}, - {ssl_options, SslOpts(Conf)}]; - (k8s) -> - [{apiserver, cuttlefish:conf_get("cluster.k8s.apiserver", Conf)}, - {service_name, cuttlefish:conf_get("cluster.k8s.service_name", Conf)}, - {address_type, cuttlefish:conf_get("cluster.k8s.address_type", Conf, ip)}, - {app_name, cuttlefish:conf_get("cluster.k8s.app_name", Conf)}, - {namespace, cuttlefish:conf_get("cluster.k8s.namespace", Conf)}, - {suffix, cuttlefish:conf_get("cluster.k8s.suffix", Conf, "")}]; - (manual) -> - [ ] - end, - {Strategy, Filter(Options(Strategy))} -end}. - -%%-------------------------------------------------------------------- -%% Node -%%-------------------------------------------------------------------- - -%% @doc Node name -{mapping, "node.name", "vm_args.-name", [ - {default, "emqx@127.0.0.1"}, - {override_env, "NODE_NAME"} -]}. - -%% @doc Specify SSL Options in the file if using SSL for erlang distribution -{mapping, "node.ssl_dist_optfile", "vm_args.-ssl_dist_optfile", [ - {datatype, string}, - hidden -]}. - -%% @doc Secret cookie for distributed erlang node -{mapping, "node.cookie", "vm_args.-setcookie", [ - {default, "emqxsecretcookie"}, - {override_env, "NODE_COOKIE"} -]}. - -{mapping, "node.data_dir", "emqx.data_dir", [ - {datatype, string} -]}. - -%% @doc http://erlang.org/doc/man/heart.html -{mapping, "node.heartbeat", "vm_args.-heart", [ - {datatype, flag}, - hidden -]}. - -{translation, "vm_args.-heart", fun(Conf) -> - case cuttlefish:conf_get("node.heartbeat", Conf) of - true -> ""; - false -> cuttlefish:invalid("should be 'on' or comment the line!") - end -end}. - -%% @doc More information at: http://erlang.org/doc/man/erl.html -{mapping, "node.async_threads", "vm_args.+A", [ - {datatype, integer}, - {validators, ["range:0-1024"]} -]}. - -%% @doc Erlang Process Limit -{mapping, "node.process_limit", "vm_args.+P", [ - {datatype, integer}, - hidden -]}. - -%% @doc The maximum number of concurrent ports/sockets. -%% Valid range is 1024-134217727 -{mapping, "node.max_ports", "vm_args.+Q", [ - {datatype, integer}, - {validators, ["range4ports"]}, - {override_env, "MAX_PORTS"} -]}. - -{validator, "range4ports", "must be 1024 to 134217727", - fun(X) -> X >= 1024 andalso X =< 134217727 end}. - -%% @doc http://www.erlang.org/doc/man/erl.html#%2bzdbbl -{mapping, "node.dist_buffer_size", "vm_args.+zdbbl", [ - {datatype, bytesize}, - {commented, "32MB"}, - hidden, - {validators, ["zdbbl_range"]} -]}. - -{translation, "vm_args.+zdbbl", - fun(Conf) -> - ZDBBL = cuttlefish:conf_get("node.dist_buffer_size", Conf, undefined), - case ZDBBL of - undefined -> undefined; - X when is_integer(X) -> cuttlefish_util:ceiling(X / 1024); %% Bytes to Kilobytes; - _ -> undefined - end - end}. - -{validator, "zdbbl_range", "must be between 1KB and 2097151KB", - fun(ZDBBL) -> - %% 2097151KB = 2147482624 - ZDBBL >= 1024 andalso ZDBBL =< 2147482624 - end -}. - -%% @doc Global GC Interval -{mapping, "node.global_gc_interval", "emqx.global_gc_interval", [ - {datatype, {duration, s}} -]}. - -%% @doc http://www.erlang.org/doc/man/erlang.html#system_flag-2 -{mapping, "node.fullsweep_after", "vm_args.-env ERL_FULLSWEEP_AFTER", [ - {default, 1000}, - {datatype, integer}, - hidden, - {validators, ["positive_integer"]} -]}. - -{validator, "positive_integer", "must be a positive integer", - fun(X) -> X >= 0 end}. - -%% Note: OTP R15 and earlier uses -env ERL_MAX_ETS_TABLES, -%% R16+ uses +e -%% @doc The ETS table limit -{mapping, "node.max_ets_tables", - cuttlefish:otp("R16", "vm_args.+e", "vm_args.-env ERL_MAX_ETS_TABLES"), [ - {default, 256000}, - {datatype, integer}, - hidden -]}. - -%% @doc Set the location of crash dumps -{mapping, "node.crash_dump", "vm_args.-env ERL_CRASH_DUMP", [ - {default, "{{crash_dump}}"}, - {datatype, file}, - hidden -]}. - -%% @doc http://www.erlang.org/doc/man/kernel_app.html#net_ticktime -{mapping, "node.dist_net_ticktime", "vm_args.-kernel net_ticktime", [ - {datatype, integer}, - hidden -]}. - -%% @doc http://www.erlang.org/doc/man/kernel_app.html -{mapping, "node.dist_listen_min", "kernel.inet_dist_listen_min", [ - {commented, 6369}, - {datatype, integer}, - hidden -]}. - -%% @see node.dist_listen_min -{mapping, "node.dist_listen_max", "kernel.inet_dist_listen_max", [ - {commented, 6369}, - {datatype, integer}, - hidden -]}. - -{mapping, "node.backtrace_depth", "emqx.backtrace_depth", [ - {default, 16}, - {datatype, integer} -]}. - -%%-------------------------------------------------------------------- -%% RPC -%%-------------------------------------------------------------------- - -%% RPC Mode. -{mapping, "rpc.mode", "emqx.rpc_mode", [ - {default, async}, - {datatype, {enum, [sync, async]}} -]}. - -{mapping, "rpc.async_batch_size", "gen_rpc.max_batch_size", [ - {default, 256}, - {datatype, integer} -]}. - -{mapping, "rpc.port_discovery", "gen_rpc.port_discovery", [ - {default, stateless}, - {datatype, {enum, [manual, stateless]}} -]}. - -%% RPC server port. -{mapping, "rpc.tcp_server_port", "gen_rpc.tcp_server_port", [ - {default, 5369}, - {datatype, integer} -]}. - -%% Number of tcp connections when connecting to RPC server -{mapping, "rpc.tcp_client_num", "gen_rpc.tcp_client_num", [ - {default, 0}, - {datatype, integer}, - {validators, ["range:gt_0_lt_256"]} -]}. - -{translation, "gen_rpc.tcp_client_num", fun(Conf) -> - case cuttlefish:conf_get("rpc.tcp_client_num", Conf) of - 0 -> max(1, erlang:system_info(schedulers) div 2); - V -> V - end -end}. - -%% Client connect timeout -{mapping, "rpc.connect_timeout", "gen_rpc.connect_timeout", [ - {default, "5s"}, - {datatype, {duration, ms}} -]}. - -%% Client and Server send timeout -{mapping, "rpc.send_timeout", "gen_rpc.send_timeout", [ - {default, 5000}, - {datatype, {duration, ms}} -]}. - -%% Authentication timeout -{mapping, "rpc.authentication_timeout", "gen_rpc.authentication_timeout", [ - {default, 5000}, - {datatype, {duration, ms}} -]}. - -%% Default receive timeout for call() functions -{mapping, "rpc.call_receive_timeout", "gen_rpc.call_receive_timeout", [ - {default, 15000}, - {datatype, {duration, ms}} -]}. - -%% Socket keepalive configuration -{mapping, "rpc.socket_keepalive_idle", "gen_rpc.socket_keepalive_idle", [ - {default, 7200}, - {datatype, {duration, s}} -]}. - -%% Seconds between probes -{mapping, "rpc.socket_keepalive_interval", "gen_rpc.socket_keepalive_interval", [ - {default, 75}, - {datatype, {duration, s}} -]}. - -%% Probes lost to close the connection -{mapping, "rpc.socket_keepalive_count", "gen_rpc.socket_keepalive_count", [ - {default, 9}, - {datatype, integer} -]}. - -%% Size of TCP send buffer -{mapping, "rpc.socket_sndbuf", "gen_rpc.socket_sndbuf", [ - {default, "1MB"}, - {datatype, bytesize} -]}. - -%% Size of TCP receive buffer -{mapping, "rpc.socket_recbuf", "gen_rpc.socket_recbuf", [ - {default, "1MB"}, - {datatype, bytesize} -]}. - -%% Size of TCP receive buffer -{mapping, "rpc.socket_buffer", "gen_rpc.socket_buffer", [ - {default, "1MB"}, - {datatype, bytesize} -]}. - -{validator, "range:gt_0_lt_256", "must greater than 0 and less than 256", - fun(X) -> X >= 0 andalso X < 256 end -}. - -%% Force client to use server listening port, because we do no provide -%% per-node listening port manual mapping from configs. -%% i.e. all nodes in the cluster should agree to the same -%% listening port number. -{translation, "gen_rpc.tcp_client_port", fun(_, _, Conf) -> - cuttlefish:conf_get("rpc.tcp_server_port", Conf) -end}. - -%%-------------------------------------------------------------------- -%% Log -%%-------------------------------------------------------------------- - -{mapping, "log.to", "kernel.logger", [ - {default, file}, - {datatype, {enum, [file, console, both]}} -]}. - -{mapping, "log.level", "kernel.logger", [ - {default, warning}, - {datatype, {enum, [debug, info, notice, warning, error, critical, alert, emergency, all]}} -]}. - -%% @doc Timezone offset to display in logs, -%% "system" use system time zone -%% "utc" for Universal Coordinated Time (UTC) -%% "+hh:mm" or "-hh:mm" for a specified offset -{mapping, "log.time_offset", "kernel.logger", [ - {default, "system"}, - {datatype, string} -]}. - -{mapping, "log.primary_log_level", "kernel.logger_level", [ - {default, warning}, - {datatype, {enum, [debug, info, notice, warning, error, critical, alert, emergency, all]}} -]}. - -{mapping, "log.dir", "kernel.logger", [ - {default, "log"}, - {datatype, string} -]}. - -{mapping, "log.file", "kernel.logger", [ - {default, "emqx.log"}, - {datatype, file} -]}. - -{mapping, "log.chars_limit", "kernel.logger", [ - {default, -1}, - {datatype, integer} -]}. - -{mapping, "log.supervisor_reports", "kernel.logger", [ - {default, error}, - {datatype, {enum, [error, progress]}}, - hidden -]}. - -%% @doc Maximum depth in Erlang term log formatting -%% and message queue inspection. -{mapping, "log.max_depth", "kernel.error_logger_format_depth", [ - {default, 20}, - {datatype, [{enum, [unlimited]}, integer]} -]}. - -%% @doc format logs as JSON objects -{mapping, "log.formatter", "kernel.logger", [ - {default, text}, - {datatype, {enum, [text, json]}} -]}. - -%% @doc format logs in a single line. -{mapping, "log.single_line", "kernel.logger", [ - {default, true}, - {datatype, {enum, [true, false]}} -]}. - -{mapping, "log.rotation.enable", "kernel.logger", [ - {default, on}, - {datatype, flag} -]}. - -{mapping, "log.rotation.size", "kernel.logger", [ - {default, "10MB"}, - {datatype, bytesize} -]}. - -{mapping, "log.size", "kernel.logger", [ - {default, infinity}, - {datatype, [bytesize, atom]} -]}. - -{mapping, "log.rotation.count", "kernel.logger", [ - {default, 5}, - {datatype, integer} -]}. - -{mapping, "log.$level.file", "kernel.logger", [ - {datatype, file} -]}. - -{mapping, "log.sync_mode_qlen", "kernel.logger", [ - {default, 100}, - {datatype, integer} -]}. - -{mapping, "log.drop_mode_qlen", "kernel.logger", [ - {default, 3000}, - {datatype, integer} -]}. - -{mapping, "log.flush_qlen", "kernel.logger", [ - {default, 8000}, - {datatype, integer} -]}. - -{mapping, "log.overload_kill", "kernel.logger", [ - {default, on}, - {datatype, flag} -]}. - -{mapping, "log.overload_kill_mem_size", "kernel.logger", [ - {default, "30MB"}, - {datatype, bytesize} -]}. - -{mapping, "log.overload_kill_qlen", "kernel.logger", [ - {default, 20000}, - {datatype, integer} -]}. - -{mapping, "log.overload_kill_restart_after", "kernel.logger", [ - {default, "5s"}, - {datatype, [{duration, ms}, atom]} -]}. - -{mapping, "log.burst_limit", "kernel.logger", [ - {default, "disabled"}, - {datatype, string} -]}. - -{mapping, "log.error_logger", "kernel.error_logger", [ - {default, silent}, - {datatype, {enum, [silent]}}, - hidden -]}. - -%% disable lager -{mapping, "lager.handlers", "lager.handlers", [ - {default, []}, - hidden -]}. -{mapping, "lager.crash_log", "lager.crash_log", [ - {default, off}, - {datatype, flag}, - hidden -]}. - -{translation, "kernel.logger_level", fun(_, _, Conf) -> - cuttlefish:conf_get("log.level", Conf) -end}. - -{translation, "kernel.logger", fun(Conf) -> - LogTo = cuttlefish:conf_get("log.to", Conf), - LogLevel = cuttlefish:conf_get("log.level", Conf), - LogTimeoffset = - case cuttlefish:conf_get("log.time_offset", Conf) of - "system" -> ""; - "utc" -> "0"; - [S, H1, H2, $:, M1, M2] = HHMM -> - (S =:= $+ orelse S =:= $-) andalso - try - begin - H = list_to_integer([H1, H2]), - M = list_to_integer([M1, M2]), - H >=0 andalso H =< 14 andalso - M >= 0 andalso M =< 59 - end - catch - _ : _ -> - error({"invalid_log_time_offset", HHMM}) - end andalso HHMM; - Other -> - error({"invalid_log_time_offset", Other}) - end, - LogType = case cuttlefish:conf_get("log.rotation.enable", Conf) of - true -> wrap; - false -> halt - end, - CharsLimit = case cuttlefish:conf_get("log.chars_limit", Conf) of - -1 -> unlimited; - V -> V - end, - SingleLine = cuttlefish:conf_get("log.single_line", Conf), - FmtName = cuttlefish:conf_get("log.formatter", Conf), - Formatter = - case FmtName of - json -> - {emqx_logger_jsonfmt, - #{chars_limit => CharsLimit, - single_line => SingleLine - }}; - text -> - {emqx_logger_textfmt, - #{template => - [time," [",level,"] ", - {clientid, - [{peername, - [clientid,"@",peername," "], - [clientid, " "]}], - [{peername, - [peername," "], - []}]}, - msg,"\n"], - chars_limit => CharsLimit, - single_line => SingleLine - }} - end, - {BustLimitOn, {MaxBurstCount, TimeWindow}} = - case string:tokens(cuttlefish:conf_get("log.burst_limit", Conf), ", ") of - ["disabled"] -> {false, {20000, 1000}}; - [Count, Window] -> - {true, {list_to_integer(Count), - case cuttlefish_duration:parse(Window, ms) of - Secs when is_integer(Secs) -> Secs; - {error, Reason1} -> error(Reason1) - end}} - end, - FileConf = fun(Filename) -> - BasicConf = - #{type => LogType, - file => filename:join(cuttlefish:conf_get("log.dir", Conf), Filename), - max_no_files => cuttlefish:conf_get("log.rotation.count", Conf), - sync_mode_qlen => cuttlefish:conf_get("log.sync_mode_qlen", Conf), - drop_mode_qlen => cuttlefish:conf_get("log.drop_mode_qlen", Conf), - flush_qlen => cuttlefish:conf_get("log.flush_qlen", Conf), - overload_kill_enable => cuttlefish:conf_get("log.overload_kill", Conf), - overload_kill_qlen => cuttlefish:conf_get("log.overload_kill_qlen", Conf), - overload_kill_mem_size => cuttlefish:conf_get("log.overload_kill_mem_size", Conf), - overload_kill_restart_after => cuttlefish:conf_get("log.overload_kill_restart_after", Conf), - burst_limit_enable => BustLimitOn, - burst_limit_max_count => MaxBurstCount, - burst_limit_window_time => TimeWindow - }, - MaxNoBytes = case LogType of - wrap -> cuttlefish:conf_get("log.rotation.size", Conf); - halt -> cuttlefish:conf_get("log.size", Conf) - end, - BasicConf#{max_no_bytes => MaxNoBytes} - end, - - Filters = case cuttlefish:conf_get("log.supervisor_reports", Conf) of - error -> [{drop_progress_reports, {fun logger_filters:progress/2, stop}}]; - progress -> [] - end, - - %% For the default logger that outputs to console - DefaultHandler = - if LogTo =:= console orelse LogTo =:= both -> - [{handler, console, logger_std_h, - #{level => LogLevel, - config => #{type => standard_io}, - formatter => Formatter, - filters => Filters - } - }]; - true -> - [{handler, default, undefined}] - end, - - %% For the file logger - FileHandler = - if LogTo =:= file orelse LogTo =:= both -> - [{handler, file, logger_disk_log_h, - #{level => LogLevel, - config => FileConf(cuttlefish:conf_get("log.file", Conf)), - formatter => Formatter, - filesync_repeat_interval => no_repeat, - filters => Filters - }}]; - true -> [] - end, - - %% For creating additional log files for specific log levels. - AdditionalLogFiles = - lists:foldl( - fun({[_, Level, _] = K, Filename}, Acc) when LogTo =:= file; LogTo =:= both -> - case cuttlefish_variable:is_fuzzy_match(K, ["log", "$level", "file"]) of - true -> [{Level, Filename} | Acc]; - false -> Acc - end; - ({_K, _V}, Acc) -> - Acc - end, [], Conf), - AdditionalHandlers = - [{handler, list_to_atom("file_for_"++Level), logger_disk_log_h, - #{level => list_to_atom(Level), - config => FileConf(Filename), - formatter => Formatter, - filesync_repeat_interval => no_repeat}} - || {Level, Filename} <- AdditionalLogFiles], - - DefaultHandler ++ FileHandler ++ AdditionalHandlers -end}. - -%%-------------------------------------------------------------------- -%% Authentication/ACL -%%-------------------------------------------------------------------- - -%% @doc Allow anonymous authentication. -{mapping, "allow_anonymous", "emqx.allow_anonymous", [ - {default, false}, - {datatype, {enum, [true, false]}} -]}. - -%% @doc ACL nomatch. -{mapping, "acl_nomatch", "emqx.acl_nomatch", [ - {default, deny}, - {datatype, {enum, [allow, deny]}} -]}. - -%% @doc Default ACL file. -{mapping, "acl_file", "emqx.acl_file", [ - {datatype, string}, - hidden -]}. - -%% @doc Enable ACL cache for publish. -{mapping, "enable_acl_cache", "emqx.enable_acl_cache", [ - {default, on}, - {datatype, flag} -]}. - -%% @doc ACL cache time-to-live. -{mapping, "acl_cache_ttl", "emqx.acl_cache_ttl", [ - {default, "1m"}, - {datatype, {duration, ms}} -]}. - -%% @doc ACL cache size. -{mapping, "acl_cache_max_size", "emqx.acl_cache_max_size", [ - {default, 32}, - {datatype, integer}, - {validators, ["range:gt_0"]} -]}. - -%% @doc Action when acl check reject current operation -{mapping, "acl_deny_action", "emqx.acl_deny_action", [ - {default, ignore}, - {datatype, {enum, [ignore, disconnect]}} -]}. - -%% @doc Flapping detect policy -{mapping, "flapping_detect_policy", "emqx.flapping_detect_policy", [ - {datatype, string}, - {default, "30,1m,5m"} -]}. - -{translation, "emqx.flapping_detect_policy", fun(Conf) -> - Policy = cuttlefish:conf_get("flapping_detect_policy", Conf), - [Threshold, Duration, Interval] = string:tokens(Policy, ", "), - ParseDuration = fun(S, Dur) -> - case cuttlefish_duration:parse(S, Dur) of - I when is_integer(I) -> I; - {error, Reason} -> error(Reason) - end - end, - #{threshold => list_to_integer(Threshold), - duration => ParseDuration(Duration, ms), - banned_interval => ParseDuration(Interval, s) - } -end}. - -{validator, "range:gt_0", "must greater than 0", - fun(X) -> X > 0 end -}. - -%%-------------------------------------------------------------------- -%% MQTT Protocol -%%-------------------------------------------------------------------- - -%% @doc Max Packet Size Allowed, 1MB by default. -{mapping, "mqtt.max_packet_size", "emqx.max_packet_size", [ - {default, "1MB"}, - {datatype, bytesize}, - {override_env, "MAX_PACKET_SIZE"} -]}. - -%% @doc Set the Max ClientId Length Allowed. -{mapping, "mqtt.max_clientid_len", "emqx.max_clientid_len", [ - {default, 65535}, - {datatype, integer} -]}. - -%% @doc Set the Maximum topic levels. -{mapping, "mqtt.max_topic_levels", "emqx.max_topic_levels", [ - {default, 0}, - {datatype, integer} -]}. - -%% @doc Set the Maximum QoS allowed. -{mapping, "mqtt.max_qos_allowed", "emqx.max_qos_allowed", [ - {default, 2}, - {datatype, integer}, - {validators, ["range:0-2"]} -]}. - -%% @doc Set the Maximum Topic Alias. -{mapping, "mqtt.max_topic_alias", "emqx.max_topic_alias", [ - {default, 65535}, - {datatype, integer} -]}. - -%% @doc Whether the server supports MQTT retained messages. -{mapping, "mqtt.retain_available", "emqx.retain_available", [ - {default, true}, - {datatype, {enum, [true, false]}} -]}. - -%% @doc Whether the Server supports MQTT Wildcard Subscriptions. -{mapping, "mqtt.wildcard_subscription", "emqx.wildcard_subscription", [ - {default, true}, - {datatype, {enum, [true, false]}} -]}. - -%% @doc Whether the Server supports MQTT Shared Subscriptions. -{mapping, "mqtt.shared_subscription", "emqx.shared_subscription", [ - {default, true}, - {datatype, {enum, [true, false]}} -]}. - -%% @doc Whether to ignore loop delivery of messages.(for mqtt v3.1.1) -{mapping, "mqtt.ignore_loop_deliver", "emqx.ignore_loop_deliver", [ - {default, true}, - {datatype, {enum, [true, false]}} -]}. - -%% @doc Whether to parse the MQTT frame in strict mode -{mapping, "mqtt.strict_mode", "emqx.strict_mode", [ - {default, false}, - {datatype, {enum, [true, false]}} -]}. - -%% @doc Specify the response information returned to the client -{mapping, "mqtt.response_information", "emqx.response_information", [ - {datatype, string} -]}. - -%%-------------------------------------------------------------------- -%% Zones -%%-------------------------------------------------------------------- - -%% @doc Idle timeout of the MQTT connection. -{mapping, "zone.$name.idle_timeout", "emqx.zones", [ - {default, "15s"}, - {datatype, {duration, ms}} -]}. - -{mapping, "zone.$name.allow_anonymous", "emqx.zones", [ - {datatype, {enum, [true, false]}} -]}. - -{mapping, "zone.$name.acl_nomatch", "emqx.zones", [ - {datatype, {enum, [allow, deny]}} -]}. - -%% @doc Enable ACL check. -{mapping, "zone.$name.enable_acl", "emqx.zones", [ - {default, off}, - {datatype, flag} -]}. - -%% @doc Action when acl check reject current operation -{mapping, "zone.$name.acl_deny_action", "emqx.zones", [ - {default, ignore}, - {datatype, {enum, [ignore, disconnect]}} -]}. - -%% @doc Enable Ban. -{mapping, "zone.$name.enable_ban", "emqx.zones", [ - {default, off}, - {datatype, flag} -]}. - -%% @doc Enable per connection statistics. -{mapping, "zone.$name.enable_stats", "emqx.zones", [ - {default, off}, - {datatype, flag} -]}. - -%% @doc Publish limit of the MQTT connections. -{mapping, "zone.$name.publish_limit", "emqx.zones", [ - {datatype, string} -]}. - -%% @doc Max Packet Size Allowed, 64K by default. -{mapping, "zone.$name.max_packet_size", "emqx.zones", [ - {datatype, bytesize} -]}. - -%% @doc Set the Max ClientId Length Allowed. -{mapping, "zone.$name.max_clientid_len", "emqx.zones", [ - {datatype, integer} -]}. - -%% @doc Set the Maximum topic levels. -{mapping, "zone.$name.max_topic_levels", "emqx.zones", [ - {datatype, integer} -]}. - -%% @doc Set the Maximum QoS allowed. -{mapping, "zone.$name.max_qos_allowed", "emqx.zones", [ - {datatype, integer}, - {validators, ["range:0-2"]} -]}. - -%% @doc Set the Maximum topic alias. -{mapping, "zone.$name.max_topic_alias", "emqx.zones", [ - {datatype, integer} -]}. - -%% @doc Whether the server supports retained messages. -{mapping, "zone.$name.retain_available", "emqx.zones", [ - {datatype, {enum, [true, false]}} -]}. - -%% @doc Whether the Server supports Wildcard Subscriptions. -{mapping, "zone.$name.wildcard_subscription", "emqx.zones", [ - {datatype, {enum, [true, false]}} -]}. - -%% @doc Whether the Server supports Shared Subscriptions. -{mapping, "zone.$name.shared_subscription", "emqx.zones", [ - {datatype, {enum, [true, false]}} -]}. - -%% @doc Server Keepalive -{mapping, "zone.$name.server_keepalive", "emqx.zones", [ - {datatype, integer} -]}. - -%% @doc Keepalive backoff -{mapping, "zone.$name.keepalive_backoff", "emqx.zones", [ - {default, 0.75}, - {datatype, float} -]}. - -%% @doc Max Number of Subscriptions Allowed. -{mapping, "zone.$name.max_subscriptions", "emqx.zones", [ - {default, 0}, - {datatype, integer} -]}. - -%% @doc Upgrade QoS according to subscription? -{mapping, "zone.$name.upgrade_qos", "emqx.zones", [ - {default, off}, - {datatype, flag} -]}. - -%% @doc Max number of QoS 1 and 2 messages that can be “inflight” at one time. -%% 0 is equivalent to maximum allowed -{mapping, "zone.$name.max_inflight", "emqx.zones", [ - {default, 0}, - {datatype, integer}, - {validators, ["range:1-65535"]} -]}. - -%% @doc Retry interval for redelivering QoS1/2 messages. -{mapping, "zone.$name.retry_interval", "emqx.zones", [ - {default, "30s"}, - {datatype, {duration, s}} -]}. - -%% @doc Max Packets that Awaiting PUBREL, 0 means no limit -{mapping, "zone.$name.max_awaiting_rel", "emqx.zones", [ - {default, 0}, - {datatype, integer} -]}. - -%% @doc Awaiting PUBREL timeout -{mapping, "zone.$name.await_rel_timeout", "emqx.zones", [ - {default, "300s"}, - {datatype, {duration, s}} -]}. - -%% @doc Ignore loop delivery of messages -{mapping, "zone.$name.ignore_loop_deliver", "emqx.zones", [ - {datatype, {enum, [true, false]}} -]}. - -%% @doc Session Expiry Interval -{mapping, "zone.$name.session_expiry_interval", "emqx.zones", [ - {default, "2h"}, - {datatype, {duration, s}} -]}. - -%% @doc Max queue length. Enqueued messages when persistent client -%% disconnected, or inflight window is full. 0 means no limit. -{mapping, "zone.$name.max_mqueue_len", "emqx.zones", [ - {default, 1000}, - {datatype, integer} -]}. - -%% @doc Topic Priorities, comma separated topic=priority pairs, -%% where priority should be integer in range 1-255 (inclusive) -%% 1 being the lowest and 255 being the highest. -%% default value `none` to indicate no priority table, hence all -%% messages are treated equal, which means either highest ('infinity'), -%% or lowest (0) depending on mqueue_default_priority config. -{mapping, "zone.$name.mqueue_priorities", "emqx.zones", [ - {default, "none"}, - {datatype, string} -]}. - -%% @doc Default priority for topics not in priority table. -{mapping, "zone.$name.mqueue_default_priority", "emqx.zones", [ - {default, lowest}, - {datatype, {enum, [highest, lowest]}} -]}. - -%% @doc Queue Qos0 messages? -{mapping, "zone.$name.mqueue_store_qos0", "emqx.zones", [ - {default, true}, - {datatype, {enum, [true, false]}} -]}. - -{mapping, "zone.$name.enable_flapping_detect", "emqx.zones", [ - {datatype, flag}, - {default, off} -]}. - -{mapping, "zone.$name.rate_limit.conn_messages_in", "emqx.zones", [ - {datatype, string} -]}. - -{mapping, "zone.$name.rate_limit.conn_bytes_in", "emqx.zones", [ - {datatype, string} -]}. - -{mapping, "zone.$name.conn_congestion.alarm", "emqx.zones", [ - {datatype, flag}, - {default, off} -]}. - -{mapping, "zone.$name.conn_congestion.min_alarm_sustain_duration", "emqx.zones", [ - {default, "1m"}, - {datatype, {duration, ms}} -]}. - -{mapping, "zone.$name.quota.conn_messages_routing", "emqx.zones", [ - {datatype, string} -]}. - -{mapping, "zone.$name.quota.overall_messages_routing", "emqx.zones", [ - {datatype, string} -]}. - -%% @doc Force connection/session process GC after this number of -%% messages | bytes passed through. -%% Numbers delimited by `|'. Zero or negative is to disable. -{mapping, "zone.$name.force_gc_policy", "emqx.zones", [ - {datatype, string} - ]}. - -%% @doc Max message queue length and total heap size to force shutdown -%% connection/session process. -%% Message queue here is the Erlang process mailbox, but not the number -%% of queued MQTT messages of QoS 1 and 2. -%% Zero or negative is to disable. -{mapping, "zone.$name.force_shutdown_policy", "emqx.zones", [ - {default, "default"}, - {datatype, string} -]}. - -{mapping, "zone.$name.mountpoint", "emqx.zones", [ - {datatype, string} -]}. - -%% @doc Use username replace client id -{mapping, "zone.$name.use_username_as_clientid", "emqx.zones", [ - {default, false}, - {datatype, {enum, [true, false]}} -]}. - -%% @doc Whether to parse the MQTT frame in strict mode -{mapping, "zone.$name.strict_mode", "emqx.zones", [ - {default, false}, - {datatype, {enum, [true, false]}} -]}. - -%% @doc Specify the response information returned to the client -{mapping, "zone.$name.response_information", "emqx.zones", [ - {datatype, string} -]}. - -%% @doc Whether to bypass the authentication step -{mapping, "zone.$name.bypass_auth_plugins", "emqx.zones", [ - {default, false}, - {datatype, {enum, [true, false]}} -]}. - -{translation, "emqx.zones", fun(Conf) -> - Ratelimit = fun(Val) -> - [L, D] = string:tokens(Val, ", "), - Limit = case cuttlefish_bytesize:parse(L) of - Sz when is_integer(Sz) -> Sz; - {error, Reason1} -> error(Reason1) - end, - Duration = case cuttlefish_duration:parse(D, s) of - Secs when is_integer(Secs) -> Secs; - {error, Reason} -> error(Reason) - end, - {Limit, Duration} - end, - Mapping = fun(["publish_limit"], Val) -> - %% XXX: Deprecated at v4.2 - {publish_limit, Ratelimit(Val)}; - (["force_gc_policy"], Val) -> - [Count, Bytes] = string:tokens(Val, "| "), - GcPolicy = case cuttlefish_bytesize:parse(Bytes) of - {error, Reason} -> - error(Reason); - Bytes1 -> - #{bytes => Bytes1, - count => list_to_integer(Count)} - end, - {force_gc_policy, GcPolicy}; - (["force_shutdown_policy"], "default") -> - {DefaultLen, DefaultSize} = - case WordSize = erlang:system_info(wordsize) of - 8 -> % arch_64 - {10000, cuttlefish_bytesize:parse("64MB")}; - 4 -> % arch_32 - {1000, cuttlefish_bytesize:parse("32MB")} - end, - {force_shutdown_policy, #{message_queue_len => DefaultLen, - max_heap_size => DefaultSize div WordSize - }}; - (["force_shutdown_policy"], Val) -> - [Len, Siz] = string:tokens(Val, "| "), - MaxSiz = case WordSize = erlang:system_info(wordsize) of - 8 -> % arch_64 - (1 bsl 59) - 1; - 4 -> % arch_32 - (1 bsl 27) - 1 - end, - ShutdownPolicy = - case cuttlefish_bytesize:parse(Siz) of - {error, Reason} -> - error(Reason); - Siz1 when Siz1 > MaxSiz -> - cuttlefish:invalid(io_lib:format("force_shutdown_policy: heap-size ~s is too large", [Siz])); - Siz1 -> - #{message_queue_len => list_to_integer(Len), - max_heap_size => Siz1 div WordSize} - end, - {force_shutdown_policy, ShutdownPolicy}; - (["mqueue_priorities"], Val) -> - case Val of - "none" -> {mqueue_priorities, none}; % NO_PRIORITY_TABLE - _ -> - MqueuePriorities = lists:foldl(fun(T, Acc) -> - %% NOTE: space in "= " is intended - [Topic, Prio] = string:tokens(T, "= "), - P = list_to_integer(Prio), - (P < 0 orelse P > 255) andalso error({bad_priority, Topic, Prio}), - maps:put(iolist_to_binary(Topic), P, Acc) - end, #{}, string:tokens(Val, ",")), - {mqueue_priorities, MqueuePriorities} - end; - (["mountpoint"], Val) -> - {mountpoint, iolist_to_binary(Val)}; - (["response_information"], Val) -> - {response_information, iolist_to_binary(Val)}; - (["rate_limit", "conn_messages_in"], Val) -> - {ratelimit, {conn_messages_in, Ratelimit(Val)}}; - (["rate_limit", "conn_bytes_in"], Val) -> - {ratelimit, {conn_bytes_in, Ratelimit(Val)}}; - (["conn_congestion", "alarm"], Val) -> - {conn_congestion_alarm_enabled, Val}; - (["conn_congestion", "min_alarm_sustain_duration"], Val) -> - {conn_congestion_min_alarm_sustain_duration, Val}; - (["quota", "conn_messages_routing"], Val) -> - {quota, {conn_messages_routing, Ratelimit(Val)}}; - (["quota", "overall_messages_routing"], Val) -> - {quota, {overall_messages_routing, Ratelimit(Val)}}; - ([Opt], Val) -> - {list_to_atom(Opt), Val} - end, - maps:to_list( - lists:foldl( - fun({["zone", Name | Opt], Val}, Zones) -> - NVal = Mapping(Opt, Val), - maps:update_with(list_to_atom(Name), - fun(Opts) -> - case NVal of - {Key, Rl} when Key == ratelimit; - Key == quota -> - Rls = proplists:get_value(Key, Opts, []), - lists:keystore(Key, 1, Opts, {Key, [Rl|Rls]}); - _ -> - [NVal|Opts] - end - end, [NVal], Zones) - end, #{}, lists:usort(cuttlefish_variable:filter_by_prefix("zone.", Conf)))) -end}. - -%%-------------------------------------------------------------------- -%% Listeners -%%-------------------------------------------------------------------- - -%%-------------------------------------------------------------------- -%% TCP Listeners - -{mapping, "listener.tcp.$name.endpoint", "emqx.listeners", [ - {datatype, [integer, ip]} -]}. - -{mapping, "listener.tcp.$name.acceptors", "emqx.listeners", [ - {default, 8}, - {datatype, integer} -]}. - -{mapping, "listener.tcp.$name.max_connections", "emqx.listeners", [ - {default, 1024}, - {datatype, integer} -]}. - -{mapping, "listener.tcp.$name.max_conn_rate", "emqx.listeners", [ - {datatype, integer} -]}. - -{mapping, "listener.tcp.$name.active_n", "emqx.listeners", [ - {default, 100}, - {datatype, integer} -]}. - -{mapping, "listener.tcp.$name.zone", "emqx.listeners", [ - {datatype, string} -]}. - -{mapping, "listener.tcp.$name.rate_limit", "emqx.listeners", [ - {default, undefined}, - {datatype, string} -]}. - -{mapping, "listener.tcp.$name.access.$id", "emqx.listeners", [ - {datatype, string} -]}. - -{mapping, "listener.tcp.$name.proxy_protocol", "emqx.listeners", [ - {datatype, flag} -]}. - -{mapping, "listener.tcp.$name.proxy_protocol_timeout", "emqx.listeners", [ - {datatype, {duration, ms}} -]}. - -%% The proxy-protocol protocol can get the certificate CN through tcp -{mapping, "listener.tcp.$name.peer_cert_as_username", "emqx.listeners", [ - {datatype, {enum, [cn]}} -]}. - -%% The proxy-protocol protocol can get the certificate CN through tcp -{mapping, "listener.tcp.$name.peer_cert_as_clientid", "emqx.listeners", [ - {datatype, {enum, [cn]}} -]}. - -{mapping, "listener.tcp.$name.backlog", "emqx.listeners", [ - {datatype, integer}, - {default, 1024} -]}. - -{mapping, "listener.tcp.$name.send_timeout", "emqx.listeners", [ - {datatype, {duration, ms}}, - {default, "15s"} -]}. - -{mapping, "listener.tcp.$name.send_timeout_close", "emqx.listeners", [ - {datatype, flag}, - {default, on} -]}. - -{mapping, "listener.tcp.$name.recbuf", "emqx.listeners", [ - {datatype, bytesize}, - hidden -]}. - -{mapping, "listener.tcp.$name.sndbuf", "emqx.listeners", [ - {datatype, bytesize}, - hidden -]}. - -{mapping, "listener.tcp.$name.buffer", "emqx.listeners", [ - {datatype, bytesize}, - hidden -]}. - -{mapping, "listener.tcp.$name.high_watermark", "emqx.listeners", [ - {datatype, bytesize}, - {default, "1MB"} - ]}. - -{mapping, "listener.tcp.$name.tune_buffer", "emqx.listeners", [ - {datatype, flag}, - hidden -]}. - -{mapping, "listener.tcp.$name.nodelay", "emqx.listeners", [ - {datatype, {enum, [true, false]}}, - hidden -]}. - -{mapping, "listener.tcp.$name.reuseaddr", "emqx.listeners", [ - {datatype, {enum, [true, false]}}, - hidden -]}. - -%%-------------------------------------------------------------------- -%% SSL Listeners - -{mapping, "listener.ssl.$name.endpoint", "emqx.listeners", [ - {datatype, [integer, ip]} -]}. - -{mapping, "listener.ssl.$name.acceptors", "emqx.listeners", [ - {default, 8}, - {datatype, integer} -]}. - -{mapping, "listener.ssl.$name.max_connections", "emqx.listeners", [ - {default, 1024}, - {datatype, integer} -]}. - -{mapping, "listener.ssl.$name.max_conn_rate", "emqx.listeners", [ - {datatype, integer} -]}. - -{mapping, "listener.ssl.$name.active_n", "emqx.listeners", [ - {default, 100}, - {datatype, integer} -]}. - -{mapping, "listener.ssl.$name.zone", "emqx.listeners", [ - {datatype, string} -]}. - -{mapping, "listener.ssl.$name.rate_limit", "emqx.listeners", [ - {default, undefined}, - {datatype, string} -]}. - -{mapping, "listener.ssl.$name.access.$id", "emqx.listeners", [ - {datatype, string} -]}. - -{mapping, "listener.ssl.$name.proxy_protocol", "emqx.listeners", [ - {datatype, flag} -]}. - -{mapping, "listener.ssl.$name.proxy_protocol_timeout", "emqx.listeners", [ - {datatype, {duration, ms}} -]}. - -{mapping, "listener.ssl.$name.backlog", "emqx.listeners", [ - {default, 1024}, - {datatype, integer} -]}. - -{mapping, "listener.ssl.$name.send_timeout", "emqx.listeners", [ - {datatype, {duration, ms}}, - {default, "15s"} -]}. - -{mapping, "listener.ssl.$name.send_timeout_close", "emqx.listeners", [ - {datatype, flag}, - {default, on} -]}. - -{mapping, "listener.ssl.$name.recbuf", "emqx.listeners", [ - {datatype, bytesize}, - hidden -]}. - -{mapping, "listener.ssl.$name.sndbuf", "emqx.listeners", [ - {datatype, bytesize}, - hidden -]}. - -{mapping, "listener.ssl.$name.buffer", "emqx.listeners", [ - {datatype, bytesize}, - hidden -]}. - -{mapping, "listener.ssl.$name.high_watermark", "emqx.listeners", [ - {datatype, bytesize}, - {default, "1MB"} - ]}. - -{mapping, "listener.ssl.$name.tune_buffer", "emqx.listeners", [ - {datatype, flag}, - hidden -]}. - -{mapping, "listener.ssl.$name.nodelay", "emqx.listeners", [ - {datatype, {enum, [true, false]}}, - hidden -]}. - -{mapping, "listener.ssl.$name.reuseaddr", "emqx.listeners", [ - {datatype, {enum, [true, false]}}, - hidden -]}. - -{mapping, "listener.ssl.$name.tls_versions", "emqx.listeners", [ - {datatype, string} -]}. - -{mapping, "listener.ssl.$name.ciphers", "emqx.listeners", [ - {datatype, string} -]}. - -{mapping, "listener.ssl.$name.psk_ciphers", "emqx.listeners", [ - {datatype, string} -]}. - -{mapping, "listener.ssl.$name.handshake_timeout", "emqx.listeners", [ - {default, "15s"}, - {datatype, {duration, ms}} -]}. - -{mapping, "listener.ssl.$name.depth", "emqx.listeners", [ - {default, 10}, - {datatype, integer} -]}. - -{mapping, "listener.ssl.$name.key_password", "emqx.listeners", [ - {datatype, string} -]}. - -{mapping, "listener.ssl.$name.dhfile", "emqx.listeners", [ - {datatype, string} -]}. - -{mapping, "listener.ssl.$name.keyfile", "emqx.listeners", [ - {datatype, string} -]}. - -{mapping, "listener.ssl.$name.certfile", "emqx.listeners", [ - {datatype, string} -]}. - -{mapping, "listener.ssl.$name.cacertfile", "emqx.listeners", [ - {datatype, string} -]}. - -{mapping, "listener.ssl.$name.verify", "emqx.listeners", [ - {datatype, atom} -]}. - -{mapping, "listener.ssl.$name.fail_if_no_peer_cert", "emqx.listeners", [ - {datatype, {enum, [true, false]}} -]}. - -{mapping, "listener.ssl.$name.secure_renegotiate", "emqx.listeners", [ - {datatype, flag} -]}. - -{mapping, "listener.ssl.$name.reuse_sessions", "emqx.listeners", [ - {default, on}, - {datatype, flag} -]}. - -{mapping, "listener.ssl.$name.honor_cipher_order", "emqx.listeners", [ - {datatype, flag} -]}. - -{mapping, "listener.ssl.$name.peer_cert_as_username", "emqx.listeners", [ - {datatype, {enum, [cn, dn, crt, pem, md5]}} -]}. - -{mapping, "listener.ssl.$name.peer_cert_as_clientid", "emqx.listeners", [ - {datatype, {enum, [cn, dn, crt, pem, md5]}} -]}. - -%%-------------------------------------------------------------------- -%% MQTT/WebSocket Listeners - -{mapping, "listener.ws.$name.endpoint", "emqx.listeners", [ - {datatype, [integer, ip]} -]}. - -{mapping, "listener.ws.$name.mqtt_path", "emqx.listeners", [ - {default, "/mqtt"}, - {datatype, string} -]}. - -{mapping, "listener.ws.$name.acceptors", "emqx.listeners", [ - {default, 8}, - {datatype, integer} -]}. - -{mapping, "listener.ws.$name.max_connections", "emqx.listeners", [ - {default, 1024}, - {datatype, integer} -]}. - -{mapping, "listener.ws.$name.max_conn_rate", "emqx.listeners", [ - {datatype, integer} -]}. - -{mapping, "listener.ws.$name.active_n", "emqx.listeners", [ - {default, 100}, - {datatype, integer} -]}. - -{mapping, "listener.ws.$name.zone", "emqx.listeners", [ - {datatype, string} -]}. - -{mapping, "listener.ws.$name.rate_limit", "emqx.listeners", [ - {default, undefined}, - {datatype, string} -]}. - -{mapping, "listener.ws.$name.access.$id", "emqx.listeners", [ - {datatype, string} -]}. - -{mapping, "listener.ws.$name.fail_if_no_subprotocol", "emqx.listeners", [ - {default, true}, - {datatype, {enum, [true, false]}} -]}. - -{mapping, "listener.ws.$name.supported_subprotocols", "emqx.listeners", [ - {default, "mqtt, mqtt-v3, mqtt-v3.1.1, mqtt-v5"}, - {datatype, string} -]}. - -{mapping, "listener.ws.$name.proxy_address_header", "emqx.listeners", [ - {default, "X-Forwarded-For"}, - {datatype, string} -]}. - -{mapping, "listener.ws.$name.proxy_port_header", "emqx.listeners", [ - {default, "X-Forwarded-Port"}, - {datatype, string} -]}. - -{mapping, "listener.ws.$name.proxy_protocol", "emqx.listeners", [ - {datatype, flag} -]}. - -{mapping, "listener.ws.$name.proxy_protocol_timeout", "emqx.listeners", [ - {datatype, {duration, ms}} -]}. - -{mapping, "listener.ws.$name.backlog", "emqx.listeners", [ - {default, 1024}, - {datatype, integer} -]}. - -{mapping, "listener.ws.$name.send_timeout", "emqx.listeners", [ - {datatype, {duration, ms}}, - {default, "15s"} -]}. - -{mapping, "listener.ws.$name.send_timeout_close", "emqx.listeners", [ - {datatype, flag}, - {default, on} -]}. - -{mapping, "listener.ws.$name.recbuf", "emqx.listeners", [ - {datatype, bytesize}, - hidden -]}. - -{mapping, "listener.ws.$name.sndbuf", "emqx.listeners", [ - {datatype, bytesize}, - hidden -]}. - -{mapping, "listener.ws.$name.buffer", "emqx.listeners", [ - {datatype, bytesize}, - hidden -]}. - -{mapping, "listener.ws.$name.tune_buffer", "emqx.listeners", [ - {datatype, flag}, - hidden -]}. - -{mapping, "listener.ws.$name.nodelay", "emqx.listeners", [ - {datatype, {enum, [true, false]}}, - hidden -]}. - -{mapping, "listener.ws.$name.compress", "emqx.listeners", [ - {datatype, {enum, [true, false]}}, - hidden -]}. - -{mapping, "listener.ws.$name.deflate_opts.level", "emqx.listeners", [ - {datatype, {enum, [none, default, best_compression, best_speed]}}, - hidden -]}. - -{mapping, "listener.ws.$name.deflate_opts.mem_level", "emqx.listeners", [ - {datatype, integer}, - {validators, ["range:1-9"]}, - hidden -]}. - -{mapping, "listener.ws.$name.deflate_opts.strategy", "emqx.listeners", [ - {datatype, {enum, [default, filtered, huffman_only, rle]}}, - hidden -]}. - -{mapping, "listener.ws.$name.deflate_opts.server_context_takeover", "emqx.listeners", [ - {datatype, {enum, [takeover, no_takeover]}}, - hidden -]}. - -{mapping, "listener.ws.$name.deflate_opts.client_context_takeover", "emqx.listeners", [ - {datatype, {enum, [takeover, no_takeover]}}, - hidden -]}. - -{mapping, "listener.ws.$name.deflate_opts.server_max_window_bits", "emqx.listeners", [ - {datatype, integer}, - hidden -]}. - -{mapping, "listener.ws.$name.deflate_opts.client_max_window_bits", "emqx.listeners", [ - {datatype, integer}, - hidden -]}. - -{mapping, "listener.ws.$name.idle_timeout", "emqx.listeners", [ - {datatype, {duration, ms}}, - hidden -]}. - -{mapping, "listener.ws.$name.max_frame_size", "emqx.listeners", [ - {datatype, integer}, - hidden -]}. - -{mapping, "listener.ws.$name.mqtt_piggyback", "emqx.listeners", [ - {datatype, {enum, [single, multiple]}}, - {default, multiple}, - hidden -]}. - -{mapping, "listener.ws.$name.peer_cert_as_username", "emqx.listeners", [ - {datatype, {enum, [cn]}} -]}. - -{mapping, "listener.ws.$name.peer_cert_as_clientid", "emqx.listeners", [ - {datatype, {enum, [cn]}} -]}. - -{mapping, "listener.ws.$name.check_origin_enable", "emqx.listeners", [ - {datatype, {enum, [true, false]}}, - {default, false}, - hidden -]}. - -{mapping, "listener.ws.$name.allow_origin_absence", "emqx.listeners", [ - {datatype, {enum, [true, false]}}, - {default, true}, - hidden -]}. - -{mapping, "listener.ws.$name.check_origins", "emqx.listeners", [ - {datatype, string}, - hidden -]}. - -%%-------------------------------------------------------------------- -%% MQTT/WebSocket/SSL Listeners - -{mapping, "listener.wss.$name.endpoint", "emqx.listeners", [ - {datatype, [integer, ip]} -]}. - -{mapping, "listener.wss.$name.mqtt_path", "emqx.listeners", [ - {default, "/mqtt"}, - {datatype, string} -]}. - -{mapping, "listener.wss.$name.acceptors", "emqx.listeners", [ - {default, 8}, - {datatype, integer} -]}. - -{mapping, "listener.wss.$name.max_connections", "emqx.listeners", [ - {default, 1024}, - {datatype, integer} -]}. - -{mapping, "listener.wss.$name.max_conn_rate", "emqx.listeners", [ - {datatype, integer} -]}. - -{mapping, "listener.wss.$name.active_n", "emqx.listeners", [ - {default, 100}, - {datatype, integer} -]}. - -{mapping, "listener.wss.$name.zone", "emqx.listeners", [ - {datatype, string} -]}. - -{mapping, "listener.wss.$name.rate_limit", "emqx.listeners", [ - {datatype, string} -]}. - -{mapping, "listener.wss.$name.fail_if_no_subprotocol", "emqx.listeners", [ - {default, true}, - {datatype, {enum, [true, false]}} -]}. - -{mapping, "listener.wss.$name.supported_subprotocols", "emqx.listeners", [ - {default, "mqtt, mqtt-v3, mqtt-v3.1.1, mqtt-v5"}, - {datatype, string} -]}. - -{mapping, "listener.wss.$name.access.$id", "emqx.listeners", [ - {datatype, string} -]}. - -{mapping, "listener.wss.$name.proxy_address_header", "emqx.listeners", [ - {default, "X-Forwarded-For"}, - {datatype, string} -]}. - -{mapping, "listener.wss.$name.proxy_port_header", "emqx.listeners", [ - {default, "X-Forwarded-Port"}, - {datatype, string} -]}. - -{mapping, "listener.wss.$name.proxy_protocol", "emqx.listeners", [ - {datatype, flag} -]}. - -{mapping, "listener.wss.$name.proxy_protocol_timeout", "emqx.listeners", [ - {datatype, {duration, ms}} -]}. - -%%{mapping, "listener.wss.$name.handshake_timeout", "emqx.listeners", [ -%% {default, "15s"}, -%% {datatype, {duration, ms}} -%%]}. - -{mapping, "listener.wss.$name.backlog", "emqx.listeners", [ - {default, 1024}, - {datatype, integer} -]}. - -{mapping, "listener.wss.$name.send_timeout", "emqx.listeners", [ - {datatype, {duration, ms}}, - {default, "15s"} -]}. - -{mapping, "listener.wss.$name.send_timeout_close", "emqx.listeners", [ - {datatype, flag}, - {default, on} -]}. - -{mapping, "listener.wss.$name.recbuf", "emqx.listeners", [ - {datatype, bytesize}, - hidden -]}. - -{mapping, "listener.wss.$name.sndbuf", "emqx.listeners", [ - {datatype, bytesize}, - hidden -]}. - -{mapping, "listener.wss.$name.buffer", "emqx.listeners", [ - {datatype, bytesize}, - hidden -]}. - -{mapping, "listener.wss.$name.tune_buffer", "emqx.listeners", [ - {datatype, flag}, - hidden -]}. - -{mapping, "listener.wss.$name.nodelay", "emqx.listeners", [ - {datatype, {enum, [true, false]}}, - hidden -]}. - -{mapping, "listener.wss.$name.tls_versions", "emqx.listeners", [ - {datatype, string} -]}. - -{mapping, "listener.wss.$name.ciphers", "emqx.listeners", [ - {datatype, string} -]}. - -{mapping, "listener.wss.$name.psk_ciphers", "emqx.listeners", [ - {datatype, string} -]}. - -{mapping, "listener.wss.$name.keyfile", "emqx.listeners", [ - {datatype, string} -]}. - -{mapping, "listener.wss.$name.certfile", "emqx.listeners", [ - {datatype, string} -]}. - -{mapping, "listener.wss.$name.cacertfile", "emqx.listeners", [ - {datatype, string} -]}. - -{mapping, "listener.wss.$name.dhfile", "emqx.listeners", [ - {datatype, string} -]}. - -{mapping, "listener.wss.$name.depth", "emqx.listeners", [ - {default, 10}, - {datatype, integer} -]}. - -{mapping, "listener.wss.$name.key_password", "emqx.listeners", [ - {datatype, string} -]}. - -{mapping, "listener.wss.$name.verify", "emqx.listeners", [ - {datatype, atom} -]}. - -{mapping, "listener.wss.$name.fail_if_no_peer_cert", "emqx.listeners", [ - {datatype, {enum, [true, false]}} -]}. - -{mapping, "listener.wss.$name.secure_renegotiate", "emqx.listeners", [ - {datatype, flag} -]}. - -{mapping, "listener.wss.$name.reuse_sessions", "emqx.listeners", [ - {default, on}, - {datatype, flag} -]}. - -{mapping, "listener.wss.$name.honor_cipher_order", "emqx.listeners", [ - {datatype, flag} -]}. - -{mapping, "listener.wss.$name.peer_cert_as_username", "emqx.listeners", [ - {datatype, {enum, [cn, dn, crt, pem, md5]}} -]}. - -{mapping, "listener.wss.$name.peer_cert_as_clientid", "emqx.listeners", [ - {datatype, {enum, [cn, dn, crt, pem, md5]}} -]}. - -{mapping, "listener.wss.$name.compress", "emqx.listeners", [ - {datatype, {enum, [true, false]}}, - hidden -]}. - -{mapping, "listener.wss.$name.deflate_opts.level", "emqx.listeners", [ - {datatype, {enum, [none, default, best_compression, best_speed]}}, - hidden -]}. - -{mapping, "listener.wss.$name.deflate_opts.mem_level", "emqx.listeners", [ - {datatype, integer}, - {validators, ["range:1-9"]}, - hidden -]}. - -{mapping, "listener.wss.$name.deflate_opts.strategy", "emqx.listeners", [ - {datatype, {enum, [default, filtered, huffman_only, rle]}}, - hidden -]}. - -{mapping, "listener.wss.$name.deflate_opts.server_context_takeover", "emqx.listeners", [ - {datatype, {enum, [takeover, no_takeover]}}, - hidden -]}. - -{mapping, "listener.wss.$name.deflate_opts.client_context_takeover", "emqx.listeners", [ - {datatype, {enum, [takeover, no_takeover]}}, - hidden -]}. - -{mapping, "listener.wss.$name.deflate_opts.server_max_window_bits", "emqx.listeners", [ - {datatype, integer}, - {validators, ["range:8-15"]}, - hidden -]}. - -{mapping, "listener.wss.$name.deflate_opts.client_max_window_bits", "emqx.listeners", [ - {datatype, integer}, - {validators, ["range:8-15"]}, - hidden -]}. - -{mapping, "listener.wss.$name.idle_timeout", "emqx.listeners", [ - {datatype, {duration, ms}}, - hidden -]}. - -{mapping, "listener.wss.$name.max_frame_size", "emqx.listeners", [ - {datatype, integer}, - hidden -]}. - -{mapping, "listener.wss.$name.mqtt_piggyback", "emqx.listeners", [ - {datatype, {enum, [single, multiple]}}, - {default, multiple}, - hidden -]}. - -{mapping, "listener.wss.$name.check_origin_enable", "emqx.listeners", [ - {datatype, {enum, [true, false]}}, - {default, false}, - hidden -]}. - -{mapping, "listener.wss.$name.allow_origin_absence", "emqx.listeners", [ - {datatype, {enum, [true, false]}}, - {default, true}, - hidden -]}. - -{mapping, "listener.wss.$name.check_origins", "emqx.listeners", [ - {datatype, string}, - hidden -]}. - -{translation, "emqx.listeners", fun(Conf) -> - Filter = fun(Opts) -> [{K, V} || {K, V} <- Opts, V =/= undefined] end, - - Atom = fun(undefined) -> undefined; (S) -> list_to_atom(S) end, - - Access = fun(S) -> - [A, CIDR] = string:tokens(S, " "), - {list_to_atom(A), case CIDR of "all" -> all; _ -> CIDR end} - end, - - AccOpts = fun(Prefix) -> - case cuttlefish_variable:filter_by_prefix(Prefix ++ ".access", Conf) of - [] -> []; - Rules -> [{access_rules, [Access(Rule) || {_, Rule} <- Rules]}] - end - end, - - RateLimit = fun(undefined) -> - undefined; - (Val) -> - [L, D] = string:tokens(Val, ", "), - Limit = case cuttlefish_bytesize:parse(L) of - Sz when is_integer(Sz) -> Sz; - {error, Reason} -> error(Reason) - end, - Duration = case cuttlefish_duration:parse(D, s) of - Secs when is_integer(Secs) -> Secs; - {error, Reason1} -> error(Reason1) - end, - {Limit, Duration} - end, - - CheckOrigin = fun(S) -> - Origins = string:tokens(S, ","), - [ list_to_binary(string:trim(O)) || O <- Origins] - end, - - WsOpts = fun(Prefix) -> - case cuttlefish_variable:filter_by_prefix(Prefix ++ ".check_origins", Conf) of - [] -> undefined; - Rules -> - OriginList = [CheckOrigin(Rule) || {_, Rule} <- Rules], - lists:flatten(OriginList) - end - end, - - LisOpts = fun(Prefix) -> - Filter([{acceptors, cuttlefish:conf_get(Prefix ++ ".acceptors", Conf)}, - {mqtt_path, cuttlefish:conf_get(Prefix ++ ".mqtt_path", Conf, undefined)}, - {max_connections, cuttlefish:conf_get(Prefix ++ ".max_connections", Conf)}, - {max_conn_rate, cuttlefish:conf_get(Prefix ++ ".max_conn_rate", Conf, undefined)}, - {active_n, cuttlefish:conf_get(Prefix ++ ".active_n", Conf, undefined)}, - {tune_buffer, cuttlefish:conf_get(Prefix ++ ".tune_buffer", Conf, undefined)}, - {zone, Atom(cuttlefish:conf_get(Prefix ++ ".zone", Conf, undefined))}, - {rate_limit, RateLimit(cuttlefish:conf_get(Prefix ++ ".rate_limit", Conf, undefined))}, - {proxy_protocol, cuttlefish:conf_get(Prefix ++ ".proxy_protocol", Conf, undefined)}, - {proxy_address_header, list_to_binary(string:lowercase(cuttlefish:conf_get(Prefix ++ ".proxy_address_header", Conf, "")))}, - {proxy_port_header, list_to_binary(string:lowercase(cuttlefish:conf_get(Prefix ++ ".proxy_port_header", Conf, "")))}, - {proxy_protocol_timeout, cuttlefish:conf_get(Prefix ++ ".proxy_protocol_timeout", Conf, undefined)}, - {fail_if_no_subprotocol, cuttlefish:conf_get(Prefix ++ ".fail_if_no_subprotocol", Conf, undefined)}, - {supported_subprotocols, string:tokens(cuttlefish:conf_get(Prefix ++ ".supported_subprotocols", Conf, ""), ", ")}, - {peer_cert_as_username, cuttlefish:conf_get(Prefix ++ ".peer_cert_as_username", Conf, undefined)}, - {peer_cert_as_clientid, cuttlefish:conf_get(Prefix ++ ".peer_cert_as_clientid", Conf, undefined)}, - {compress, cuttlefish:conf_get(Prefix ++ ".compress", Conf, undefined)}, - {idle_timeout, cuttlefish:conf_get(Prefix ++ ".idle_timeout", Conf, undefined)}, - {max_frame_size, cuttlefish:conf_get(Prefix ++ ".max_frame_size", Conf, undefined)}, - {mqtt_piggyback, cuttlefish:conf_get(Prefix ++ ".mqtt_piggyback", Conf, undefined)}, - {check_origin_enable, cuttlefish:conf_get(Prefix ++ ".check_origin_enable", Conf, undefined)}, - {allow_origin_absence, cuttlefish:conf_get(Prefix ++ ".allow_origin_absence", Conf, undefined)}, - {check_origins, WsOpts(Prefix)} | AccOpts(Prefix)]) - end, - DeflateOpts = fun(Prefix) -> - Filter([{level, cuttlefish:conf_get(Prefix ++ ".deflate_opts.level", Conf, undefined)}, - {mem_level, cuttlefish:conf_get(Prefix ++ ".deflate_opts.mem_level", Conf, undefined)}, - {strategy, cuttlefish:conf_get(Prefix ++ ".deflate_opts.strategy", Conf, undefined)}, - {server_context_takeover, cuttlefish:conf_get(Prefix ++ ".deflate_opts.server_context_takeover", Conf, undefined)}, - {client_context_takeover, cuttlefish:conf_get(Prefix ++ ".deflate_opts.client_context_takeover", Conf, undefined)}, - {server_max_windows_bits, cuttlefish:conf_get(Prefix ++ ".deflate_opts.server_max_window_bits", Conf, undefined)}, - {client_max_windows_bits, cuttlefish:conf_get(Prefix ++ ".deflate_opts.client_max_window_bits", Conf, undefined)}]) - end, - TcpOpts = fun(Prefix) -> - Filter([{backlog, cuttlefish:conf_get(Prefix ++ ".backlog", Conf, undefined)}, - {send_timeout, cuttlefish:conf_get(Prefix ++ ".send_timeout", Conf, undefined)}, - {send_timeout_close, cuttlefish:conf_get(Prefix ++ ".send_timeout_close", Conf, undefined)}, - {recbuf, cuttlefish:conf_get(Prefix ++ ".recbuf", Conf, undefined)}, - {sndbuf, cuttlefish:conf_get(Prefix ++ ".sndbuf", Conf, undefined)}, - {buffer, cuttlefish:conf_get(Prefix ++ ".buffer", Conf, undefined)}, - {high_watermark, cuttlefish:conf_get(Prefix ++ ".high_watermark", Conf, undefined)}, - {nodelay, cuttlefish:conf_get(Prefix ++ ".nodelay", Conf, true)}, - {reuseaddr, cuttlefish:conf_get(Prefix ++ ".reuseaddr", Conf, undefined)}]) - end, - SplitFun = fun(undefined) -> undefined; (S) -> string:tokens(S, ",") end, - MapPSKCiphers = fun(PSKCiphers) -> - lists:map( - fun("PSK-AES128-CBC-SHA") -> {psk, aes_128_cbc, sha}; - ("PSK-AES256-CBC-SHA") -> {psk, aes_256_cbc, sha}; - ("PSK-3DES-EDE-CBC-SHA") -> {psk, '3des_ede_cbc', sha}; - ("PSK-RC4-SHA") -> {psk, rc4_128, sha} - end, PSKCiphers) - end, - SslOpts = fun(Prefix) -> - Versions = case SplitFun(cuttlefish:conf_get(Prefix ++ ".tls_versions", Conf, undefined)) of - undefined -> undefined; - L -> [list_to_atom(V) || V <- L] - end, - TLSCiphers = cuttlefish:conf_get(Prefix++".ciphers", Conf, undefined), - PSKCiphers = cuttlefish:conf_get(Prefix++".psk_ciphers", Conf, undefined), - Ciphers = - case {TLSCiphers, PSKCiphers} of - {undefined, undefined} -> - cuttlefish:invalid(Prefix++".ciphers or "++Prefix++".psk_ciphers is absent"); - {TLSCiphers, undefined} -> - SplitFun(TLSCiphers); - {undefined, PSKCiphers} -> - MapPSKCiphers(SplitFun(PSKCiphers)); - {_TLSCiphers, _PSKCiphers} -> - cuttlefish:invalid(Prefix++".ciphers and "++Prefix++".psk_ciphers cannot be configured at the same time") - end, - UserLookupFun = - case PSKCiphers of - undefined -> undefined; - _ -> {fun emqx_psk:lookup/3, <<>>} - end, - Filter([{versions, Versions}, - {ciphers, Ciphers}, - {user_lookup_fun, UserLookupFun}, - {handshake_timeout, cuttlefish:conf_get(Prefix ++ ".handshake_timeout", Conf, undefined)}, - {depth, cuttlefish:conf_get(Prefix ++ ".depth", Conf, undefined)}, - {password, cuttlefish:conf_get(Prefix ++ ".key_password", Conf, undefined)}, - {dhfile, cuttlefish:conf_get(Prefix ++ ".dhfile", Conf, undefined)}, - {keyfile, cuttlefish:conf_get(Prefix ++ ".keyfile", Conf, undefined)}, - {certfile, cuttlefish:conf_get(Prefix ++ ".certfile", Conf, undefined)}, - {cacertfile, cuttlefish:conf_get(Prefix ++ ".cacertfile", Conf, undefined)}, - {verify, cuttlefish:conf_get(Prefix ++ ".verify", Conf, undefined)}, - {fail_if_no_peer_cert, cuttlefish:conf_get(Prefix ++ ".fail_if_no_peer_cert", Conf, undefined)}, - {secure_renegotiate, cuttlefish:conf_get(Prefix ++ ".secure_renegotiate", Conf, undefined)}, - {reuse_sessions, cuttlefish:conf_get(Prefix ++ ".reuse_sessions", Conf, undefined)}, - {honor_cipher_order, cuttlefish:conf_get(Prefix ++ ".honor_cipher_order", Conf, undefined)}]) - end, - - Listen_fix = fun({Ip, Port}) -> case inet:parse_address(Ip) of - {ok, R} -> {R, Port}; - _ -> {Ip, Port} - end; - (Other) -> Other - end, - - TcpListeners = fun(Type, Name) -> - Prefix = string:join(["listener", Type, Name], "."), - ListenOnN = case cuttlefish:conf_get(Prefix ++ ".endpoint", Conf, undefined) of - undefined -> []; - ListenOn -> Listen_fix(ListenOn) - end, - [#{ proto => Atom(Type) - , name => Name - , listen_on => ListenOnN - , opts => [ {deflate_options, DeflateOpts(Prefix)} - , {tcp_options, TcpOpts(Prefix)} - | LisOpts(Prefix) - ] - } - ] - end, - SslListeners = fun(Type, Name) -> - Prefix = string:join(["listener", Type, Name], "."), - case cuttlefish:conf_get(Prefix ++ ".endpoint", Conf, undefined) of - undefined -> - []; - ListenOn -> - [#{ proto => Atom(Type) - , name => Name - , listen_on => Listen_fix(ListenOn) - , opts => [ {deflate_options, DeflateOpts(Prefix)} - , {tcp_options, TcpOpts(Prefix)} - , {ssl_options, SslOpts(Prefix)} - | LisOpts(Prefix) - ] - } - ] - end - end, - lists:flatten([TcpListeners(Type, Name) || {["listener", Type, Name, "endpoint"], ListenOn} - <- cuttlefish_variable:filter_by_prefix("listener.tcp", Conf) - ++ cuttlefish_variable:filter_by_prefix("listener.ws", Conf)] - ++ - [SslListeners(Type, Name) || {["listener", Type, Name, "endpoint"], ListenOn} - <- cuttlefish_variable:filter_by_prefix("listener.ssl", Conf) - ++ cuttlefish_variable:filter_by_prefix("listener.wss", Conf)]) -end}. - -%%-------------------------------------------------------------------- -%% Modules -%%-------------------------------------------------------------------- - -{mapping, "modules.loaded_file", "emqx.modules_loaded_file", [ - {datatype, string} -]}. - -{mapping, "module.presence.qos", "emqx.modules", [ - {default, 1}, - {datatype, integer}, - {validators, ["range:0-2"]} -]}. - -{mapping, "module.subscription.$id.topic", "emqx.modules", [ - {datatype, string} -]}. - -{mapping, "module.subscription.$id.qos", "emqx.modules", [ - {default, 1}, - {datatype, integer}, - {validators, ["range:0-2"]} -]}. - -{mapping, "module.subscription.$id.nl", "emqx.modules", [ - {default, 0}, - {datatype, integer}, - {validators, ["range:0-1"]} -]}. - -{mapping, "module.subscription.$id.rap", "emqx.modules", [ - {default, 0}, - {datatype, integer}, - {validators, ["range:0-1"]} -]}. - -{mapping, "module.subscription.$id.rh", "emqx.modules", [ - {default, 0}, - {datatype, integer}, - {validators, ["range:0-2"]} -]}. - -{mapping, "module.rewrite.rule.$id", "emqx.modules", [ - {datatype, string} -]}. - -{mapping, "module.rewrite.pub.rule.$id", "emqx.modules", [ - {datatype, string} -]}. - -{mapping, "module.rewrite.sub.rule.$id", "emqx.modules", [ - {datatype, string} -]}. - -{translation, "emqx.modules", fun(Conf, _, Conf1) -> - Subscriptions = fun() -> - List = cuttlefish_variable:filter_by_prefix("module.subscription", Conf), - TopicList = [{N, Topic}|| {[_,"subscription",N,"topic"], Topic} <- List], - [{iolist_to_binary(T), #{ qos => cuttlefish:conf_get("module.subscription." ++ N ++ ".qos", Conf, 0), - nl => cuttlefish:conf_get("module.subscription." ++ N ++ ".nl", Conf, 0), - rap => cuttlefish:conf_get("module.subscription." ++ N ++ ".rap", Conf, 0), - rh => cuttlefish:conf_get("module.subscription." ++ N ++ ".rh", Conf, 0) - }} || {N, T} <- TopicList] - end, - Rewrites = fun() -> - Rules = cuttlefish_variable:filter_by_prefix("module.rewrite.rule", Conf), - PubRules = cuttlefish_variable:filter_by_prefix("module.rewrite.pub.rule", Conf), - SubRules = cuttlefish_variable:filter_by_prefix("module.rewrite.sub.rule", Conf), - TotalRules = lists:append( - [ {["module", "rewrite", "pub", "rule", I], Rule} || {["module", "rewrite", "rule", I], Rule} <- Rules] ++ PubRules, - [ {["module", "rewrite", "sub", "rule", I], Rule} || {["module", "rewrite", "rule", I], Rule} <- Rules] ++ SubRules - ), - lists:map(fun({[_, "rewrite", PubOrSub, "rule", I], Rule}) -> - [Topic, Re, Dest] = string:tokens(Rule, " "), - {rewrite, list_to_atom(PubOrSub), list_to_binary(Topic), list_to_binary(Re), list_to_binary(Dest)} - end, TotalRules) - end, - lists:append([ - [{emqx_mod_presence, [{qos, cuttlefish:conf_get("module.presence.qos", Conf, 1)}]}], - [{emqx_mod_subscription, Subscriptions()}], - [{emqx_mod_rewrite, Rewrites()}], - [{emqx_mod_topic_metrics, []}], - [{emqx_mod_delayed, []}], - [{emqx_mod_acl_internal, [{acl_file, cuttlefish:conf_get("acl_file", Conf1)}]}] - ]) -end}. - -%%------------------------------------------------------------------- -%% Plugins -%%------------------------------------------------------------------- - -{mapping, "plugins.etc_dir", "emqx.plugins_etc_dir", [ - {datatype, string} -]}. - -{mapping, "plugins.loaded_file", "emqx.plugins_loaded_file", [ - {datatype, string} -]}. - -{mapping, "plugins.expand_plugins_dir", "emqx.expand_plugins_dir", [ - {datatype, string} -]}. - -%%-------------------------------------------------------------------- -%% Broker -%%-------------------------------------------------------------------- - -{mapping, "broker.sys_interval", "emqx.broker_sys_interval", [ - {datatype, {duration, ms}}, - {default, "1m"} -]}. - -{mapping, "broker.sys_heartbeat", "emqx.broker_sys_heartbeat", [ - {datatype, {duration, ms}}, - {default, "30s"} -]}. - -{mapping, "broker.enable_session_registry", "emqx.enable_session_registry", [ - {default, on}, - {datatype, flag} -]}. - -{mapping, "broker.session_locking_strategy", "emqx.session_locking_strategy", [ - {default, quorum}, - {datatype, {enum, [local,leader,quorum,all]}} -]}. - -%% @doc Shared Subscription Dispatch Strategy. -{mapping, "broker.shared_subscription_strategy", "emqx.shared_subscription_strategy", [ - {default, round_robin}, - {datatype, - {enum, - [random, %% randomly pick a subscriber - round_robin, %% round robin alive subscribers one message after another - sticky, %% pick a random subscriber and stick to it - hash, %% hash client ID to a group member - hash_clientid, - hash_topic - ]}} -]}. - -%% @doc Enable or disable shared dispatch acknowledgement for QoS1 and QoS2 messages -{mapping, "broker.shared_dispatch_ack_enabled", "emqx.shared_dispatch_ack_enabled", - [ {default, false}, - {datatype, {enum, [true, false]}} - ]}. - -{mapping, "broker.route_batch_clean", "emqx.route_batch_clean", [ - {default, on}, - {datatype, flag} -]}. - -%% @doc Performance toggle for subscribe/unsubscribe wildcard topic. -%% Change this toggle only when there are many wildcard topics. -%% key: mnesia translational updates with per-key locks. recommended for single node setup. -%% tab: mnesia translational updates with table lock. recommended for multi-nodes setup. -%% global: global lock protected updates. recommended for larger cluster. -%% NOTE: when changing from/to 'global' lock, it requires all nodes in the cluster -%% -{mapping, "broker.perf.route_lock_type", "emqx.route_lock_type", [ - {default, key}, - {datatype, {enum, [key, tab, global]}} -]}. - -%% @doc Enable trie path compaction. -%% Enabling it significantly improves wildcard topic subscribe rate, -%% if wildcard topics have unique prefixes like: 'sensor/{{id}}/+/', -%% where ID is unique per subscriber. -%% -%% Topic match performance (when publishing) may degrade if messages -%% are mostly published to topics with large number of levels. -%% -%% NOTE: This is a cluster-wide configuration. -%% It rquires all nodes to be stopped before changing it. -{mapping, "broker.perf.trie_compaction", "emqx.trie_compaction", [ - {default, true}, - {datatype, {enum, [true, false]}} -]}. - -%%-------------------------------------------------------------------- -%% System Monitor -%%-------------------------------------------------------------------- - -%% @doc Long GC, don't monitor in production mode for: -%% https://github.com/erlang/otp/blob/feb45017da36be78d4c5784d758ede619fa7bfd3/erts/emulator/beam/erl_gc.c#L421 -{mapping, "sysmon.long_gc", "emqx.sysmon", [ - {default, 0}, - {datatype, [integer, {duration, ms}]} -]}. - -%% @doc Long Schedule(ms) -{mapping, "sysmon.long_schedule", "emqx.sysmon", [ - {default, 240}, - {datatype, [integer, {duration, ms}]} -]}. - -%% @doc Large Heap -{mapping, "sysmon.large_heap", "emqx.sysmon", [ - {default, "8MB"}, - {datatype, bytesize} -]}. - -%% @doc Monitor Busy Port -{mapping, "sysmon.busy_port", "emqx.sysmon", [ - {default, false}, - {datatype, {enum, [true, false]}} -]}. - -%% @doc Monitor Busy Dist Port -{mapping, "sysmon.busy_dist_port", "emqx.sysmon", [ - {default, true}, - {datatype, {enum, [true, false]}} -]}. - -{translation, "emqx.sysmon", fun(Conf) -> - Configs = cuttlefish_variable:filter_by_prefix("sysmon", Conf), - [{list_to_atom(Name), Value} || {[_, Name], Value} <- Configs] -end}. - -%%-------------------------------------------------------------------- -%% Operating System Monitor -%%-------------------------------------------------------------------- - -{mapping, "os_mon.cpu_check_interval", "emqx.os_mon", [ - {default, 60}, - {datatype, {duration, s}} -]}. - -{mapping, "os_mon.cpu_high_watermark", "emqx.os_mon", [ - {default, "80%"}, - {datatype, {percent, float}} -]}. - -{mapping, "os_mon.cpu_low_watermark", "emqx.os_mon", [ - {default, "60%"}, - {datatype, {percent, float}} -]}. - -{mapping, "os_mon.mem_check_interval", "emqx.os_mon", [ - {default, 60}, - {datatype, {duration, s}} -]}. - -{mapping, "os_mon.sysmem_high_watermark", "emqx.os_mon", [ - {default, "70%"}, - {datatype, {percent, float}} -]}. - -{mapping, "os_mon.procmem_high_watermark", "emqx.os_mon", [ - {default, "5%"}, - {datatype, {percent, float}} -]}. - -{translation, "emqx.os_mon", fun(Conf) -> - [{cpu_check_interval, cuttlefish:conf_get("os_mon.cpu_check_interval", Conf)}, - {cpu_high_watermark, cuttlefish:conf_get("os_mon.cpu_high_watermark", Conf) * 100}, - {cpu_low_watermark, cuttlefish:conf_get("os_mon.cpu_low_watermark", Conf) * 100}, - {mem_check_interval, cuttlefish:conf_get("os_mon.mem_check_interval", Conf)}, - {sysmem_high_watermark, cuttlefish:conf_get("os_mon.sysmem_high_watermark", Conf) * 100}, - {procmem_high_watermark, cuttlefish:conf_get("os_mon.procmem_high_watermark", Conf) * 100}] -end}. - -%%-------------------------------------------------------------------- -%% VM Monitor -%%-------------------------------------------------------------------- -{mapping, "vm_mon.check_interval", "emqx.vm_mon", [ - {default, 30}, - {datatype, {duration, s}} -]}. - -{mapping, "vm_mon.process_high_watermark", "emqx.vm_mon", [ - {default, "80%"}, - {datatype, {percent, float}} -]}. - -{mapping, "vm_mon.process_low_watermark", "emqx.vm_mon", [ - {default, "60%"}, - {datatype, {percent, float}} -]}. - -{translation, "emqx.vm_mon", fun(Conf) -> - [{check_interval, cuttlefish:conf_get("vm_mon.check_interval", Conf)}, - {process_high_watermark, cuttlefish:conf_get("vm_mon.process_high_watermark", Conf) * 100}, - {process_low_watermark, cuttlefish:conf_get("vm_mon.process_low_watermark", Conf) * 100}] -end}. - -%%-------------------------------------------------------------------- -%% Alarm -%%-------------------------------------------------------------------- -{mapping, "alarm.actions", "emqx.alarm", [ - {default, "log,publish"}, - {datatype, string} -]}. - -{mapping, "alarm.size_limit", "emqx.alarm", [ - {default, 1000}, - {datatype, integer} -]}. - -{mapping, "alarm.validity_period", "emqx.alarm", [ - {default, "24h"}, - {datatype, {duration, s}} -]}. - -{translation, "emqx.alarm", fun(Conf) -> - [{actions, [list_to_atom(Action) || Action <- string:tokens(cuttlefish:conf_get("alarm.actions", Conf), ",")]}, - {size_limit, cuttlefish:conf_get("alarm.size_limit", Conf)}, - {validity_period, cuttlefish:conf_get("alarm.validity_period", Conf)}] -end}. - -%%-------------------------------------------------------------------- -%% Telemetry -%%-------------------------------------------------------------------- -{mapping, "telemetry.enabled", "emqx.telemetry", [ - {default, false}, - {datatype, {enum, [true, false]}} -]}. - -{mapping, "telemetry.url", "emqx.telemetry", [ - {default, "https://telemetry-emqx-io.bigpar.vercel.app/api/telemetry"}, - {datatype, string} -]}. - -{mapping, "telemetry.report_interval", "emqx.telemetry", [ - {default, "7d"}, - {datatype, {duration, s}} -]}. - -{translation, "emqx.telemetry", fun(Conf) -> - [ {enabled, cuttlefish:conf_get("telemetry.enabled", Conf)} - , {url, cuttlefish:conf_get("telemetry.url", Conf)} - , {report_interval, cuttlefish:conf_get("telemetry.report_interval", Conf)} - ] -end}. diff --git a/rebar.config b/rebar.config index 6c1e3c593..3a169c4a9 100644 --- a/rebar.config +++ b/rebar.config @@ -11,8 +11,6 @@ warn_obsolete_guard,compressed, {d, snk_kind, msg}]}. -{extra_src_dirs, [{"etc", [{recursive,true}]}]}. - {xref_checks,[undefined_function_calls,undefined_functions,locals_not_used, deprecated_function_calls,warnings_as_errors,deprecated_functions]}. @@ -33,8 +31,6 @@ {post_hooks,[]}. -{erl_first_files, ["src/emqx_logger.erl", "src/emqx_rule_actions_trans.erl"]}. - {deps, [ {gpb, "4.11.2"} %% gpb only used to build, but not for release, pin it here to avoid fetching a wrong version due to rebar plugins scattered in all the deps , {ehttpc, {git, "https://github.com/emqx/ehttpc", {tag, "0.1.5"}}} From c573474ec6a88cc43fcb8b0d8f09f49dac977dcd Mon Sep 17 00:00:00 2001 From: Zaiming Shi Date: Thu, 3 Jun 2021 11:59:59 +0200 Subject: [PATCH 02/11] build: work with new emqx app location --- rebar.config.erl | 12 +++++++----- scripts/find-apps.sh | 3 --- scripts/find-suites.sh | 5 +---- scripts/split-config.escript | 8 ++++++-- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/rebar.config.erl b/rebar.config.erl index 6f2816b3a..820ca327f 100644 --- a/rebar.config.erl +++ b/rebar.config.erl @@ -351,7 +351,7 @@ etc_overlay(ReleaseType) -> [community_plugin_etc_overlays(App) || App <- relx_plugin_apps_extra()], [ {mkdir, "etc/"} , {mkdir, "etc/plugins"} - , {template, "etc/BUILT_ON", "releases/{{release_version}}/BUILT_ON"} + , {template, "{{base_dir}}/lib/emqx/etc/BUILT_ON", "releases/{{release_version}}/BUILT_ON"} , {copy, "{{base_dir}}/lib/emqx/etc/certs","etc/"} ] ++ lists:map( @@ -368,18 +368,20 @@ extra_overlay(edge) -> []. emqx_etc_overlay(cloud) -> emqx_etc_overlay_common() ++ - [ {"etc/emqx_cloud/vm.args","etc/vm.args"} + [ {"{{base_dir}}/lib/emqx/etc/emqx_cloud/vm.args","etc/vm.args"} ]; emqx_etc_overlay(edge) -> emqx_etc_overlay_common() ++ - [ {"etc/emqx_edge/vm.args","etc/vm.args"} + [ {"{{base_dir}}/lib/emqx/etc/emqx_edge/vm.args","etc/vm.args"} ]. emqx_etc_overlay_common() -> - ["etc/acl.conf", "etc/emqx.conf", "etc/ssl_dist.conf", + [{"{{base_dir}}/lib/emqx/etc/acl.conf", "etc/acl.conf"}, + {"{{base_dir}}/lib/emqx/etc/emqx.conf", "etc/emqx.conf"}, + {"{{base_dir}}/lib/emqx/etc/ssl_dist.conf", "etc/ssl_dist.conf"}, %% TODO: check why it has to end with .paho %% and why it is put to etc/plugins dir - {"etc/acl.conf.paho", "etc/plugins/acl.conf.paho"}]. + {"{{base_dir}}/lib/emqx/etc/acl.conf.paho", "etc/plugins/acl.conf.paho"}]. plugin_etc_overlays(App0) -> App = atom_to_list(App0), diff --git a/scripts/find-apps.sh b/scripts/find-apps.sh index fabec239e..1f199269c 100755 --- a/scripts/find-apps.sh +++ b/scripts/find-apps.sh @@ -10,9 +10,6 @@ find_app() { find "${appdir}" -mindepth 1 -maxdepth 1 -type d } -# append emqx application first -echo 'emqx' - find_app 'apps' if [ -f 'EMQX_ENTERPRISE' ]; then find_app 'lib-ee' diff --git a/scripts/find-suites.sh b/scripts/find-suites.sh index 97939d931..da477694d 100755 --- a/scripts/find-suites.sh +++ b/scripts/find-suites.sh @@ -8,8 +8,5 @@ set -euo pipefail # ensure dir cd -P -- "$(dirname -- "$0")/.." -TESTDIR="test" -if [ "$1" != "emqx" ]; then - TESTDIR="$1/test" -fi +TESTDIR="$1/test" find "${TESTDIR}" -name "*_SUITE.erl" 2>/dev/null | xargs | tr ' ' ',' diff --git a/scripts/split-config.escript b/scripts/split-config.escript index 04f94269c..0a26d6fd2 100755 --- a/scripts/split-config.escript +++ b/scripts/split-config.escript @@ -13,7 +13,7 @@ -define(BASE, <<"emqx">>). main(_) -> - {ok, Bin} = file:read_file("etc/emqx.conf"), + {ok, Bin} = file:read_file(conf_file()), Lines = binary:split(Bin, <<"\n">>, [global]), Sections0 = parse_sections(Lines), {value, _, Sections1} = lists:keytake(<<"modules">>, 1, Sections0), @@ -24,6 +24,10 @@ main(_) -> end, IncludeNames), ok = dump_sections([{N, Base ++ Includes}| Sections2]). +etc_dir() -> filename:join(["apps", "emqx", "etc"]). + +conf_file() -> filename:join([etc_dir(), "emqx.conf"]). + parse_sections(Lines) -> {ok, P} = re:compile("#+\s*CONFIG_SECTION_(BGN|END)\s*=\s*([^\s-]+)\s*="), Parser = @@ -57,7 +61,7 @@ parse_sections([Line | Lines], Parse, Section, Sections) -> dump_sections([]) -> ok; dump_sections([{Name, Lines0} | Rest]) -> - Filename = filename:join(["etc", iolist_to_binary([Name, ".conf.seg"])]), + Filename = filename:join([etc_dir(), iolist_to_binary([Name, ".conf.seg"])]), Lines = [[L, "\n"] || L <- Lines0], ok = file:write_file(Filename, Lines), dump_sections(Rest). From 948ff66111e7352039e3434d825c2bfbde424051 Mon Sep 17 00:00:00 2001 From: Zaiming Shi Date: Thu, 3 Jun 2021 12:36:08 +0200 Subject: [PATCH 03/11] test: fix rebar3 eunit arg --dir apps/app_name causes rebar3 to crash because eunit handler injects a `[]` as one of the extra_src_dirs option --- .github/workflows/run_cts_tests.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/run_cts_tests.yaml b/.github/workflows/run_cts_tests.yaml index 89d9df7de..9126d97ac 100644 --- a/.github/workflows/run_cts_tests.yaml +++ b/.github/workflows/run_cts_tests.yaml @@ -48,7 +48,7 @@ jobs: export CUTTLEFISH_ENV_OVERRIDE_PREFIX=EMQX_ printenv > .env docker exec -i erlang sh -c "make ensure-rebar3" - docker exec -i erlang sh -c "./rebar3 eunit --dir apps/emqx_auth_ldap" + docker exec -i erlang sh -c "./rebar3 eunit --application=emqx_auth_ldap" docker exec --env-file .env -i erlang sh -c "./rebar3 ct --dir apps/emqx_auth_ldap" - uses: actions/upload-artifact@v1 if: failure() @@ -117,7 +117,7 @@ jobs: export CUTTLEFISH_ENV_OVERRIDE_PREFIX=EMQX_ printenv > .env docker exec -i erlang sh -c "make ensure-rebar3" - docker exec -i erlang sh -c "./rebar3 eunit --dir apps/emqx_auth_mongo" + docker exec -i erlang sh -c "./rebar3 eunit --application=emqx_auth_mongo" docker exec --env-file .env -i erlang sh -c "./rebar3 ct --dir apps/emqx_auth_mongo" - uses: actions/upload-artifact@v1 if: failure() @@ -199,7 +199,7 @@ jobs: export CUTTLEFISH_ENV_OVERRIDE_PREFIX=EMQX_ printenv > .env docker exec -i erlang sh -c "make ensure-rebar3" - docker exec -i erlang sh -c "./rebar3 eunit --dir apps/emqx_auth_mysql" + docker exec -i erlang sh -c "./rebar3 eunit --application=emqx_auth_mysql" docker exec --env-file .env -i erlang sh -c "./rebar3 ct --dir apps/emqx_auth_mysql" - uses: actions/upload-artifact@v1 if: failure() @@ -273,7 +273,7 @@ jobs: CUTTLEFISH_ENV_OVERRIDE_PREFIX=EMQX_ printenv > .env docker exec -i erlang sh -c "make ensure-rebar3" - docker exec -i erlang sh -c "./rebar3 eunit --dir apps/emqx_auth_pgsql" + docker exec -i erlang sh -c "./rebar3 eunit --application=emqx_auth_pgsql" docker exec --env-file .env -i erlang sh -c "./rebar3 ct --dir apps/emqx_auth_pgsql" - uses: actions/upload-artifact@v1 if: failure() @@ -394,7 +394,7 @@ jobs: export EMQX_AUTH__REIDS__PASSWORD=public printenv > .env docker exec -i erlang sh -c "make ensure-rebar3" - docker exec -i erlang sh -c "./rebar3 eunit --dir apps/emqx_auth_redis" + docker exec -i erlang sh -c "./rebar3 eunit --application=emqx_auth_redis" docker exec --env-file .env -i erlang sh -c "./rebar3 ct --dir apps/emqx_auth_redis" - uses: actions/upload-artifact@v1 if: failure() From 311cb7b659c9ca160d493a1504b7e9899ca2895c Mon Sep 17 00:00:00 2001 From: Zaiming Shi Date: Thu, 3 Jun 2021 17:31:25 +0200 Subject: [PATCH 04/11] build: relocate BUILT_ON template --- {apps/emqx/etc => data}/BUILT_ON | 0 rebar.config.erl | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename {apps/emqx/etc => data}/BUILT_ON (100%) diff --git a/apps/emqx/etc/BUILT_ON b/data/BUILT_ON similarity index 100% rename from apps/emqx/etc/BUILT_ON rename to data/BUILT_ON diff --git a/rebar.config.erl b/rebar.config.erl index 820ca327f..c3dbd16c0 100644 --- a/rebar.config.erl +++ b/rebar.config.erl @@ -326,6 +326,7 @@ relx_overlay(ReleaseType) -> , {template, "data/loaded_plugins.tmpl", "data/loaded_plugins"} , {template, "data/loaded_modules.tmpl", "data/loaded_modules"} , {template, "data/emqx_vars", "releases/emqx_vars"} + , {template, "data/BUILT_ON", "releases/{{release_version}}/BUILT_ON"} , {copy, "bin/emqx", "bin/emqx"} , {copy, "bin/emqx_ctl", "bin/emqx_ctl"} , {copy, "bin/node_dump", "bin/node_dump"} @@ -351,7 +352,6 @@ etc_overlay(ReleaseType) -> [community_plugin_etc_overlays(App) || App <- relx_plugin_apps_extra()], [ {mkdir, "etc/"} , {mkdir, "etc/plugins"} - , {template, "{{base_dir}}/lib/emqx/etc/BUILT_ON", "releases/{{release_version}}/BUILT_ON"} , {copy, "{{base_dir}}/lib/emqx/etc/certs","etc/"} ] ++ lists:map( From 36e3675d54c26a9cc432f3926490e9b20fd31729 Mon Sep 17 00:00:00 2001 From: Zaiming Shi Date: Thu, 3 Jun 2021 17:51:09 +0200 Subject: [PATCH 05/11] test(emqx_listeners_SUITE): fix etc dir path --- apps/emqx/test/emqx_listeners_SUITE.erl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/emqx/test/emqx_listeners_SUITE.erl b/apps/emqx/test/emqx_listeners_SUITE.erl index 57319ac54..53f388dfa 100644 --- a/apps/emqx/test/emqx_listeners_SUITE.erl +++ b/apps/emqx/test/emqx_listeners_SUITE.erl @@ -48,7 +48,7 @@ t_restart_listeners(_) -> ok = emqx_listeners:stop(). render_config_file() -> - Path = local_path(["..", "..", "..", "..", "etc", "emqx.conf"]), + Path = local_path(["etc", "emqx.conf"]), {ok, Temp} = file:read_file(Path), Vars0 = mustache_vars(), Vars = [{atom_to_list(N), iolist_to_binary(V)} || {N, V} <- Vars0], From 0431c64708ebedb917bfaf6586486f1908e3f3f7 Mon Sep 17 00:00:00 2001 From: Zaiming Shi Date: Thu, 3 Jun 2021 19:49:51 +0200 Subject: [PATCH 06/11] test(ci): fix path to cert dir --- .ci/docker-compose-file/docker-compose-emqx-cluster.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/docker-compose-file/docker-compose-emqx-cluster.yaml b/.ci/docker-compose-file/docker-compose-emqx-cluster.yaml index 18e1bb6cc..6bc8e67e2 100644 --- a/.ci/docker-compose-file/docker-compose-emqx-cluster.yaml +++ b/.ci/docker-compose-file/docker-compose-emqx-cluster.yaml @@ -9,7 +9,7 @@ services: - emqx2 volumes: - ./haproxy/haproxy.cfg:/usr/local/etc/haproxy/haproxy.cfg - - ../../etc/certs:/usr/local/etc/haproxy/certs + - ../../apps/emqx/etc/certs:/usr/local/etc/haproxy/certs ports: - "18083:18083" # - "1883:1883" From 045a944192ce33c562fa28c84625eab839d08f0a Mon Sep 17 00:00:00 2001 From: Zaiming Shi Date: Thu, 3 Jun 2021 22:49:02 +0200 Subject: [PATCH 07/11] chore(ci): check emqx app standalone --- .github/workflows/run_emqx_app_tests.yaml | 26 +++++++++++++++++++++++ apps/emqx/rebar.config | 1 + 2 files changed, 27 insertions(+) create mode 100644 .github/workflows/run_emqx_app_tests.yaml diff --git a/.github/workflows/run_emqx_app_tests.yaml b/.github/workflows/run_emqx_app_tests.yaml new file mode 100644 index 000000000..3fa30b484 --- /dev/null +++ b/.github/workflows/run_emqx_app_tests.yaml @@ -0,0 +1,26 @@ +name: Check emqx app standalone + +on: + push: + tags: + - v* + - e* + pull_request: + +jobs: + check_all: + runs-on: ubuntu-20.04 + container: emqx/build-env:erl23.2.7.2-emqx-2-ubuntu20.04 + + steps: + - uses: actions/checkout@v2 + - name: run + run: | + make ensure-rebar3 + cp rebar3 apps/emqx/ + cd apps/emqx + ./rebar3 xref + ./rebar3 dialyzer + ./rebar3 eunit -v + ./rebar3 ct -v + ./rebar3 proper -d test/props diff --git a/apps/emqx/rebar.config b/apps/emqx/rebar.config index 8eea43f6e..37f8546a8 100644 --- a/apps/emqx/rebar.config +++ b/apps/emqx/rebar.config @@ -23,6 +23,7 @@ , {snabbkaffe, {git, "https://github.com/kafka4beam/snabbkaffe.git", {tag, "0.13.0"}}} ]}. +{plugins, [rebar3_proper]}. {extra_src_dirs, [{"etc", [recursive]}]}. {profiles, [ From 13b7dcef4b6acf7b113148215e338d8d9f9b4fba Mon Sep 17 00:00:00 2001 From: Zaiming Shi Date: Fri, 4 Jun 2021 13:05:43 +0200 Subject: [PATCH 08/11] chore(emqx): emqtt as test dependency --- apps/emqx/rebar.config | 1 - 1 file changed, 1 deletion(-) diff --git a/apps/emqx/rebar.config b/apps/emqx/rebar.config index 37f8546a8..317f9af59 100644 --- a/apps/emqx/rebar.config +++ b/apps/emqx/rebar.config @@ -18,7 +18,6 @@ , {cuttlefish, {git, "https://github.com/emqx/cuttlefish", {tag, "v4.0.1"}}} %% todo delete when plugins use hocon , {hocon, {git, "https://github.com/emqx/hocon.git", {tag, "0.5.0"}}} , {pbkdf2, {git, "https://github.com/emqx/erlang-pbkdf2.git", {branch, "2.0.4"}}} - , {emqtt, {git, "https://github.com/emqx/emqtt", {tag, "1.2.3.1"}}} , {recon, {git, "https://github.com/ferd/recon", {tag, "2.5.1"}}} , {snabbkaffe, {git, "https://github.com/kafka4beam/snabbkaffe.git", {tag, "0.13.0"}}} ]}. From 7da34b80e5d3852f21c10b243a64a71eafb66c70 Mon Sep 17 00:00:00 2001 From: Zaiming Shi Date: Sat, 5 Jun 2021 18:28:24 +0200 Subject: [PATCH 09/11] chore(emqx): bump app version to 5.0.0 --- apps/emqx/src/emqx.app.src | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/emqx/src/emqx.app.src b/apps/emqx/src/emqx.app.src index 884c511df..e909702ae 100644 --- a/apps/emqx/src/emqx.app.src +++ b/apps/emqx/src/emqx.app.src @@ -1,7 +1,7 @@ {application, emqx, [{id, "emqx"}, {description, "EMQ X"}, - {vsn, "4.3.3"}, % strict semver, bump manually! + {vsn, "5.0.0"}, % strict semver, bump manually! {modules, []}, {registered, []}, {applications, [kernel,stdlib,gproc,gen_rpc,esockd,cowboy,sasl,os_mon]}, From b92a6837d7ce5b9430df7b32e57d8544b95a2de5 Mon Sep 17 00:00:00 2001 From: Zaiming Shi Date: Sat, 5 Jun 2021 21:36:10 +0200 Subject: [PATCH 10/11] build(emqx): fix emqx standalone dialyzer --- apps/emqx/rebar.config | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/apps/emqx/rebar.config b/apps/emqx/rebar.config index 317f9af59..2c566d7f8 100644 --- a/apps/emqx/rebar.config +++ b/apps/emqx/rebar.config @@ -24,7 +24,6 @@ {plugins, [rebar3_proper]}. {extra_src_dirs, [{"etc", [recursive]}]}. - {profiles, [ {test, [{deps, @@ -36,3 +35,13 @@ {extra_src_dirs, [{"test",[recursive]}]} ]} ]}. + +{dialyzer, [ + {warnings, [unmatched_returns, error_handling, race_conditions]}, + {plt_location, "."}, + {plt_prefix, "emqx_dialyzer"}, + {plt_apps, all_apps}, + {plt_extra_apps, [hocon]}, + {statistics, true} + ] +}. From 4ee6c8271487d3b6d9aef84beaf9207b581e8287 Mon Sep 17 00:00:00 2001 From: Zaiming Shi Date: Sat, 5 Jun 2021 22:34:10 +0200 Subject: [PATCH 11/11] test(emqx_rule_engine_SUITE): delegate app start to ct-helper (2.0.0) --- .../test/emqx_rule_engine_SUITE.erl | 15 +++++---------- rebar.config.erl | 2 +- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/apps/emqx_rule_engine/test/emqx_rule_engine_SUITE.erl b/apps/emqx_rule_engine/test/emqx_rule_engine_SUITE.erl index d9675cc6b..d8244c018 100644 --- a/apps/emqx_rule_engine/test/emqx_rule_engine_SUITE.erl +++ b/apps/emqx_rule_engine/test/emqx_rule_engine_SUITE.erl @@ -2553,25 +2553,20 @@ stop_apps() -> start_apps() -> [start_apps(App, SchemaFile, ConfigFile) || {App, SchemaFile, ConfigFile} - <- [{emqx, deps_path(emqx, "priv/emqx.schema"), - deps_path(emqx, "etc/emqx.conf.rendered")}, + <- [{emqx, emqx_schema, deps_path(emqx, "etc/emqx.conf")}, {emqx_rule_engine, local_path("priv/emqx_rule_engine.schema"), local_path("etc/emqx_rule_engine.conf")}]]. -start_apps(App, SchemaFile, ConfigFile) -> - emqx_ct_helpers:read_schema_configs(SchemaFile, ConfigFile), - set_special_configs(App), - {ok, _} = application:ensure_all_started(App). +start_apps(App, Schema, ConfigFile) -> + emqx_ct_helpers:start_app(App, Schema, ConfigFile, fun set_special_configs/1). deps_path(App, RelativePath) -> - %% Note: not lib_dir because etc dir is not sym-link-ed to _build dir - %% but priv dir is - Path0 = code:priv_dir(App), + Path0 = code:lib_dir(App), Path = case file:read_link(Path0) of {ok, Resolved} -> Resolved; {error, _} -> Path0 end, - filename:join([Path, "..", RelativePath]). + filename:join([Path, RelativePath]). local_path(RelativePath) -> deps_path(emqx_rule_engine, RelativePath). diff --git a/rebar.config.erl b/rebar.config.erl index c3dbd16c0..df943cc42 100644 --- a/rebar.config.erl +++ b/rebar.config.erl @@ -106,7 +106,7 @@ test_plugins() -> test_deps() -> [ {bbmustache, "1.10.0"} - , {emqx_ct_helpers, {git, "https://github.com/emqx/emqx-ct-helpers", {branch, "hocon"}}} + , {emqx_ct_helpers, {git, "https://github.com/emqx/emqx-ct-helpers", {tag, "2.0.0"}}} , meck ].