From 5d3946fe23b899e999b95c98567baef971d69211 Mon Sep 17 00:00:00 2001 From: Shawn <506895667@qq.com> Date: Thu, 9 Mar 2023 10:53:53 +0800 Subject: [PATCH] fix: add catch-all clauses in appups --- .../emqx_lua_hook/src/emqx_lua_hook.appup.src | 6 ++- apps/emqx_lwm2m/src/emqx_lwm2m.appup.src | 50 ++++++++++--------- .../emqx_psk_file/src/emqx_psk_file.appup.src | 6 ++- apps/emqx_sn/src/emqx_sn.appup.src | 6 ++- 4 files changed, 38 insertions(+), 30 deletions(-) diff --git a/apps/emqx_lua_hook/src/emqx_lua_hook.appup.src b/apps/emqx_lua_hook/src/emqx_lua_hook.appup.src index c4178c620..166d5eb54 100644 --- a/apps/emqx_lua_hook/src/emqx_lua_hook.appup.src +++ b/apps/emqx_lua_hook/src/emqx_lua_hook.appup.src @@ -2,6 +2,8 @@ %% Unless you know what you are doing, DO NOT edit manually!! {VSN, [{"4.3.1",[{load_module,emqx_lua_script,brutal_purge,soft_purge,[]}]}, - {"4.3.0",[{load_module,emqx_lua_script,brutal_purge,soft_purge,[]}]}], + {"4.3.0",[{load_module,emqx_lua_script,brutal_purge,soft_purge,[]}]}, + {<<".*">>,[]}], [{"4.3.1",[{load_module,emqx_lua_script,brutal_purge,soft_purge,[]}]}, - {"4.3.0",[{load_module,emqx_lua_script,brutal_purge,soft_purge,[]}]}]}. + {"4.3.0",[{load_module,emqx_lua_script,brutal_purge,soft_purge,[]}]}, + {<<".*">>,[]}]}. diff --git a/apps/emqx_lwm2m/src/emqx_lwm2m.appup.src b/apps/emqx_lwm2m/src/emqx_lwm2m.appup.src index 793feecd1..c172ca572 100644 --- a/apps/emqx_lwm2m/src/emqx_lwm2m.appup.src +++ b/apps/emqx_lwm2m/src/emqx_lwm2m.appup.src @@ -7,14 +7,18 @@ {load_module,emqx_lwm2m_message,brutal_purge,soft_purge,[]}, {load_module,emqx_lwm2m_json,brutal_purge,soft_purge,[]}, {load_module,emqx_lwm2m_cmd_handler,brutal_purge,soft_purge,[]}]}, - {<<"4\\.3\\.[0-1]">>,[{restart_application,emqx_lwm2m}]}, - {"4.3.2", + {"4.3.6", [{load_module,emqx_lwm2m_xml_object_db,brutal_purge,soft_purge,[]}, {load_module,emqx_lwm2m_xml_object,brutal_purge,soft_purge,[]}, + {load_module,emqx_lwm2m_message,brutal_purge,soft_purge,[]}, + {load_module,emqx_lwm2m_json,brutal_purge,soft_purge,[]}, + {load_module,emqx_lwm2m_cmd_handler,brutal_purge,soft_purge,[]}]}, + {"4.3.5", + [{load_module,emqx_lwm2m_xml_object_db,brutal_purge,soft_purge,[]}, + {load_module,emqx_lwm2m_xml_object,brutal_purge,soft_purge,[]}, + {load_module,emqx_lwm2m_message,brutal_purge,soft_purge,[]}, {load_module,emqx_lwm2m_json,brutal_purge,soft_purge,[]}, {load_module,emqx_lwm2m_cmd_handler,brutal_purge,soft_purge,[]}, - {load_module,emqx_lwm2m_protocol,brutal_purge,soft_purge,[]}, - {load_module,emqx_lwm2m_message,brutal_purge,soft_purge,[]}, {load_module,emqx_lwm2m_api,brutal_purge,soft_purge,[]}]}, {<<"4\\.3\\.[3-4]">>, [{load_module,emqx_lwm2m_xml_object_db,brutal_purge,soft_purge,[]}, @@ -24,33 +28,34 @@ {load_module,emqx_lwm2m_cmd_handler,brutal_purge,soft_purge,[]}, {load_module,emqx_lwm2m_protocol,brutal_purge,soft_purge,[]}, {load_module,emqx_lwm2m_api,brutal_purge,soft_purge,[]}]}, - {"4.3.5", + {"4.3.2", [{load_module,emqx_lwm2m_xml_object_db,brutal_purge,soft_purge,[]}, {load_module,emqx_lwm2m_xml_object,brutal_purge,soft_purge,[]}, - {load_module,emqx_lwm2m_message,brutal_purge,soft_purge,[]}, {load_module,emqx_lwm2m_json,brutal_purge,soft_purge,[]}, {load_module,emqx_lwm2m_cmd_handler,brutal_purge,soft_purge,[]}, - {load_module,emqx_lwm2m_api,brutal_purge,soft_purge,[]}]}, - {"4.3.6", - [{load_module,emqx_lwm2m_xml_object_db,brutal_purge,soft_purge,[]}, - {load_module,emqx_lwm2m_xml_object,brutal_purge,soft_purge,[]}, + {load_module,emqx_lwm2m_protocol,brutal_purge,soft_purge,[]}, {load_module,emqx_lwm2m_message,brutal_purge,soft_purge,[]}, - {load_module,emqx_lwm2m_json,brutal_purge,soft_purge,[]}, - {load_module,emqx_lwm2m_cmd_handler,brutal_purge,soft_purge,[]}]}], + {load_module,emqx_lwm2m_api,brutal_purge,soft_purge,[]}]}, + {<<"4\\.3\\.[0-1]">>,[{restart_application,emqx_lwm2m}]}, + {<<".*">>,[]}], [{"4.3.7", [{load_module,emqx_lwm2m_xml_object_db,brutal_purge,soft_purge,[]}, {load_module,emqx_lwm2m_xml_object,brutal_purge,soft_purge,[]}, {load_module,emqx_lwm2m_message,brutal_purge,soft_purge,[]}, {load_module,emqx_lwm2m_json,brutal_purge,soft_purge,[]}, {load_module,emqx_lwm2m_cmd_handler,brutal_purge,soft_purge,[]}]}, - {<<"4\\.3\\.[0-1]">>,[{restart_application,emqx_lwm2m}]}, - {"4.3.2", + {"4.3.6", [{load_module,emqx_lwm2m_xml_object_db,brutal_purge,soft_purge,[]}, {load_module,emqx_lwm2m_xml_object,brutal_purge,soft_purge,[]}, + {load_module,emqx_lwm2m_message,brutal_purge,soft_purge,[]}, + {load_module,emqx_lwm2m_json,brutal_purge,soft_purge,[]}, + {load_module,emqx_lwm2m_cmd_handler,brutal_purge,soft_purge,[]}]}, + {"4.3.5", + [{load_module,emqx_lwm2m_xml_object_db,brutal_purge,soft_purge,[]}, + {load_module,emqx_lwm2m_xml_object,brutal_purge,soft_purge,[]}, + {load_module,emqx_lwm2m_message,brutal_purge,soft_purge,[]}, {load_module,emqx_lwm2m_json,brutal_purge,soft_purge,[]}, {load_module,emqx_lwm2m_cmd_handler,brutal_purge,soft_purge,[]}, - {load_module,emqx_lwm2m_protocol,brutal_purge,soft_purge,[]}, - {load_module,emqx_lwm2m_message,brutal_purge,soft_purge,[]}, {load_module,emqx_lwm2m_api,brutal_purge,soft_purge,[]}]}, {<<"4\\.3\\.[3-4]">>, [{load_module,emqx_lwm2m_xml_object_db,brutal_purge,soft_purge,[]}, @@ -60,16 +65,13 @@ {load_module,emqx_lwm2m_cmd_handler,brutal_purge,soft_purge,[]}, {load_module,emqx_lwm2m_protocol,brutal_purge,soft_purge,[]}, {load_module,emqx_lwm2m_api,brutal_purge,soft_purge,[]}]}, - {"4.3.5", + {"4.3.2", [{load_module,emqx_lwm2m_xml_object_db,brutal_purge,soft_purge,[]}, {load_module,emqx_lwm2m_xml_object,brutal_purge,soft_purge,[]}, - {load_module,emqx_lwm2m_message,brutal_purge,soft_purge,[]}, {load_module,emqx_lwm2m_json,brutal_purge,soft_purge,[]}, {load_module,emqx_lwm2m_cmd_handler,brutal_purge,soft_purge,[]}, - {load_module,emqx_lwm2m_api,brutal_purge,soft_purge,[]}]}, - {"4.3.6", - [{load_module,emqx_lwm2m_xml_object_db,brutal_purge,soft_purge,[]}, - {load_module,emqx_lwm2m_xml_object,brutal_purge,soft_purge,[]}, + {load_module,emqx_lwm2m_protocol,brutal_purge,soft_purge,[]}, {load_module,emqx_lwm2m_message,brutal_purge,soft_purge,[]}, - {load_module,emqx_lwm2m_json,brutal_purge,soft_purge,[]}, - {load_module,emqx_lwm2m_cmd_handler,brutal_purge,soft_purge,[]}]}]}. + {load_module,emqx_lwm2m_api,brutal_purge,soft_purge,[]}]}, + {<<"4\\.3\\.[0-1]">>,[{restart_application,emqx_lwm2m}]}, + {<<".*">>,[]}]}. diff --git a/apps/emqx_psk_file/src/emqx_psk_file.appup.src b/apps/emqx_psk_file/src/emqx_psk_file.appup.src index c782000b5..6d70231ce 100644 --- a/apps/emqx_psk_file/src/emqx_psk_file.appup.src +++ b/apps/emqx_psk_file/src/emqx_psk_file.appup.src @@ -2,9 +2,11 @@ {VSN, [{"4.3.0", [{load_module,emqx_psk_file,brutal_purge,soft_purge,[]}, - {load_module,emqx_psk_file_sup,brutal_purge,soft_purge,[]}]} + {load_module,emqx_psk_file_sup,brutal_purge,soft_purge,[]}]}, + {<<".*">>,[]} ], [{"4.3.0", [{load_module,emqx_psk_file,brutal_purge,soft_purge,[]}, - {load_module,emqx_psk_file_sup,brutal_purge,soft_purge,[]}]} + {load_module,emqx_psk_file_sup,brutal_purge,soft_purge,[]}]}, + {<<".*">>,[]} ]}. diff --git a/apps/emqx_sn/src/emqx_sn.appup.src b/apps/emqx_sn/src/emqx_sn.appup.src index c87bbb0a1..8f429ee6f 100644 --- a/apps/emqx_sn/src/emqx_sn.appup.src +++ b/apps/emqx_sn/src/emqx_sn.appup.src @@ -29,7 +29,8 @@ {load_module,emqx_sn_app,brutal_purge,soft_purge,[]}, {update,emqx_sn_gateway,{advanced,["4.3.2"]}} ]}, - {<<"4\\.3\\.[0-1]">>, [{restart_application,emqx_sn}]} + {<<"4\\.3\\.[0-1]">>, [{restart_application,emqx_sn}]}, + {<<".*">>,[]} ], [ {"4.3.7",[ @@ -60,5 +61,6 @@ {load_module,emqx_sn_app,brutal_purge,soft_purge,[]}, {update,emqx_sn_gateway,{advanced,["4.3.2"]}} ]}, - {<<"4\\.3\\.[0-1]">>, [{restart_application,emqx_sn}]} + {<<"4\\.3\\.[0-1]">>, [{restart_application,emqx_sn}]}, + {<<".*">>,[]} ]}.