startup fixes (2600hz#2969)

* check db result in fix_media_names * ensure system databases in get_databases/0
DAOCUONG · Dec 10, 2016 · 823c8fc · 823c8fc
1 parent 4bbb110
commit 823c8fc
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/core/kazoo_apps/src/kapps_maintenance.erl b/core/kazoo_apps/src/kapps_maintenance.erl
@@ -186,7 +186,7 @@ refresh([Database|Databases], Pause, Total) ->
 -spec get_databases() -> ne_binaries().
 get_databases() ->
     {'ok', Databases} = kz_datamgr:db_info(),
-    lists:sort(fun get_database_sort/2, Databases).
+    lists:sort(fun get_database_sort/2, lists:usort(Databases ++ ?KZ_SYSTEM_DBS)).
 
 -spec get_database_sort(ne_binary(), ne_binary()) -> boolean().
 get_database_sort(Db1, Db2) ->

diff --git a/core/kazoo_media/src/kazoo_media_maintenance.erl b/core/kazoo_media/src/kazoo_media_maintenance.erl
@@ -378,8 +378,12 @@ fix_media_name(JObj) ->
 
 -spec fix_media_names() -> any().
 fix_media_names() ->
-    {'ok', JObjs} = kz_datamgr:all_docs(?KZ_MEDIA_DB),
-    case [ JObj || JObj <- JObjs, filter_media_names(JObj)] of
-        [] -> kapps_config:set(?CONFIG_CAT, <<"fix_media_names">>, 'false');
-        List -> lists:foreach(fun fix_media_name/1, List)
+    case kz_datamgr:all_docs(?KZ_MEDIA_DB) of
+        {'ok', JObjs} ->
+            case [ JObj || JObj <- JObjs, filter_media_names(JObj)] of
+                [] -> kapps_config:set(?CONFIG_CAT, <<"fix_media_names">>, 'false');
+                List -> lists:foreach(fun fix_media_name/1, List)
+            end;
+        {'error', Error} ->
+            lager:debug("error '~p' getting media names", [Error])
     end.