Просмотр исходного кода

fix(ft-s3): fix release settings

Ilya Averyanov 3 лет назад
Родитель
Сommit
07ae50a54b
4 измененных файлов с 18 добавлено и 11 удалено
  1. 2 1
      apps/emqx_ft/src/emqx_ft.app.src
  2. 9 4
      apps/emqx_machine/src/emqx_machine_boot.erl
  3. 3 2
      mix.exs
  4. 4 4
      rebar.config.erl

+ 2 - 1
apps/emqx_ft/src/emqx_ft.app.src

@@ -6,7 +6,8 @@
     {applications, [
     {applications, [
         kernel,
         kernel,
         stdlib,
         stdlib,
-        gproc
+        gproc,
+        emqx_s3
     ]},
     ]},
     {env, []},
     {env, []},
     {modules, []}
     {modules, []}

+ 9 - 4
apps/emqx_machine/src/emqx_machine_boot.erl

@@ -146,12 +146,17 @@ basic_reboot_apps() ->
                 emqx_authz,
                 emqx_authz,
                 emqx_slow_subs,
                 emqx_slow_subs,
                 emqx_auto_subscribe,
                 emqx_auto_subscribe,
-                emqx_plugins,
-                emqx_s3
+                emqx_plugins
             ],
             ],
     case emqx_release:edition() of
     case emqx_release:edition() of
-        ce -> CE;
-        ee -> CE ++ []
+        ce ->
+            CE;
+        ee ->
+            CE ++
+                [
+                    emqx_s3,
+                    emqx_ft
+                ]
     end.
     end.
 
 
 sorted_reboot_apps() ->
 sorted_reboot_apps() ->

+ 3 - 2
mix.exs

@@ -293,7 +293,6 @@ defmodule EMQXUmbrella.MixProject do
         emqx_psk: :permanent,
         emqx_psk: :permanent,
         emqx_slow_subs: :permanent,
         emqx_slow_subs: :permanent,
         emqx_plugins: :permanent,
         emqx_plugins: :permanent,
-        emqx_ft: :permanent,
         emqx_mix: :none
         emqx_mix: :none
       ] ++
       ] ++
       if(enable_quicer?(), do: [quicer: :permanent], else: []) ++
       if(enable_quicer?(), do: [quicer: :permanent], else: []) ++
@@ -308,7 +307,9 @@ defmodule EMQXUmbrella.MixProject do
           emqx_license: :permanent,
           emqx_license: :permanent,
           emqx_ee_conf: :load,
           emqx_ee_conf: :load,
           emqx_ee_connector: :permanent,
           emqx_ee_connector: :permanent,
-          emqx_ee_bridge: :permanent
+          emqx_ee_bridge: :permanent,
+          emqx_s3: :permanent,
+          emqx_ft: :permanent
         ],
         ],
         else: []
         else: []
       )
       )

+ 4 - 4
rebar.config.erl

@@ -400,9 +400,7 @@ relx_apps(ReleaseType, Edition) ->
             emqx_prometheus,
             emqx_prometheus,
             emqx_psk,
             emqx_psk,
             emqx_slow_subs,
             emqx_slow_subs,
-            emqx_plugins,
-            emqx_ft,
-            emqx_s3
+            emqx_plugins
         ] ++
         ] ++
         [quicer || is_quicer_supported()] ++
         [quicer || is_quicer_supported()] ++
         [bcrypt || provide_bcrypt_release(ReleaseType)] ++
         [bcrypt || provide_bcrypt_release(ReleaseType)] ++
@@ -424,7 +422,9 @@ relx_apps_per_edition(ee) ->
         emqx_license,
         emqx_license,
         {emqx_ee_conf, load},
         {emqx_ee_conf, load},
         emqx_ee_connector,
         emqx_ee_connector,
-        emqx_ee_bridge
+        emqx_ee_bridge,
+        emqx_s3,
+        emqx_ft
     ];
     ];
 relx_apps_per_edition(ce) ->
 relx_apps_per_edition(ce) ->
     [].
     [].