fix mnesia

src/iot_app.erl

@@ -15,7 +15,11 @@ start(_StartType, _StartArgs) ->
     erlang:system_flag(fullsweep_after, 16),
     try
         %% 启动并校验已经初始化好的 mnesia 数据库
-        ok = iot_mnesia:start(),
+        ok = iot_mnesia:start()
+    catch
+        Class:Reason:Stack ->
+            logger:warning("[iot_app] start failed, class: ~p, reason: ~p, stack: ~p", [Class, Reason, Stack])
+    end,
 
     %% 启动http服务。当前 supervisor 初始化依赖本机 simulator API，因此保留此顺序。
     start_http_server(),
@@ -23,19 +27,7 @@ start(_StartType, _StartArgs) ->
     %% 启动ssl服务
     start_ssl_server(),
 
-        case iot_sup:start_link() of
+    iot_sup:start_link().
-            {ok, _Pid} = Ok ->
-                Ok;
-            Error ->
-                stop_started_services(),
-                Error
-        end
-    catch
-        Class:Reason:Stack ->
-            stop_started_services(),
-            logger:warning("[iot_app] start failed, class: ~p, reason: ~p, stack: ~p", [Class, Reason, Stack]),
-            {error, Reason}
-    end.
 
 stop(_State) ->
     stop_started_services(),

src/mnesia/iot_mnesia.erl

@@ -17,21 +17,21 @@
 -spec init() -> ok | {error, term()}.
 init() ->
     with_result(fun() ->
-        ok = ensure_persistent_dir(),
         _ = mnesia:stop(),
-        ok = create_schema_if_missing(),
+        ok = mnesia:delete_schema([node()]),
-        ok = start_mnesia(),
+        ok = mnesia:create_schema([node()]),
+        ok = ensure_persistent_dir(),
+        ok = mnesia:start(),
         ok = create_tables(),
         ok = wait_for_tables(),
-        ok = stop(),
         ok
     end).
 
 -spec start() -> ok | {error, term()}.
 start() ->
     with_result(fun() ->
+        ok = mnesia:start(),
         ok = ensure_persistent_dir(),
-        ok = start_mnesia(),
         ok = wait_for_tables(),
         ok = verify_tables(),
         log_runtime_info(),
@@ -52,28 +52,6 @@ ensure_persistent_dir() ->
             throw({mnesia_dir_required, node()})
     end.
 
--spec create_schema_if_missing() -> ok.
-create_schema_if_missing() ->
-    case mnesia:create_schema([node()]) of
-        ok ->
-            ok;
-        {error, {_, {already_exists, _}}} ->
-            ok;
-        {error, Reason} ->
-            throw({create_schema_failed, Reason})
-    end.
-
--spec start_mnesia() -> ok.
-start_mnesia() ->
-    case mnesia:start() of
-        ok ->
-            ok;
-        {error, {already_started, mnesia}} ->
-            ok;
-        {error, Reason} ->
-            throw({start_mnesia_failed, Reason})
-    end.
-
 -spec create_tables() -> ok.
 create_tables() ->
     case efka_client_store:ensure_table() of