KAZOO-4091: rebase artifacts

2600hz · Apr 15, 2016 · 32e0bfc · 32e0bfc
1 parent d7d8d24
commit 32e0bfc
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 14 deletions.
diff --git a/core/kazoo_caches/src/kzc_ets_listener.erl b/core/kazoo_caches/src/kzc_ets_listener.erl
@@ -10,6 +10,8 @@
 %%%-------------------------------------------------------------------
 -module(kzc_ets_listener).
 
+-include("kz_caches.hrl").
+
 -export([init/1
          ,handle_call/3
          ,handle_cast/2

diff --git a/core/kazoo_couch/src/kazoo_couch.app.src b/core/kazoo_couch/src/kazoo_couch.app.src
@@ -4,11 +4,12 @@
   ,{id, "14f7c3cd-06f0-40a8-b750-2fda4cb06ea7"}
   ,{vsn, "4.0.0"}
   ,{modules, []}
-  ,{registered, [whistle_couch_cache, wh_couch_bootstrap, couch_compactor_fsm, whistle_couch_sup, wh_couch_connection_sup, wh_change_handler_sup, wh_couch_connections]}
+  ,{registered, [ ]}
   ,{applications, [ kernel
                   , stdlib
                   , crypto
                   , public_key
+
                   , couchbeam
                   , lager
                   ]}

diff --git a/core/kazoo_data/src/kazoo_data.app.src b/core/kazoo_data/src/kazoo_data.app.src
@@ -4,14 +4,16 @@
   ,{id, "108013a5-95e7-4e18-5757-344d22bebce8"}
   ,{vsn, "4.0.0"}
   ,{modules, []}
-  ,{registered, [kazoo_data_cache, kazoo_data_plan_cache, kazoo_data_app, kazoo_data_sup]}
+  ,{registered, [kazoo_data_cache, kazoo_data_plan_cache, kazoo_data_sup, kazoo_data_bootstrap, kz_dataconnection_sup, kz_dataconnections]}
   ,{applications, [ kernel
                   , stdlib
                   , crypto
                   , public_key
-                  , lager
+
                   , whistle_config
                   , whistle_amqp
+
+                  , lager
                   ]}
   ,{mod, {kazoo_data_app, []}}
  ]}.
diff --git a/core/kazoo_data/src/kzs_cache.erl b/core/kazoo_data/src/kzs_cache.erl
@@ -28,7 +28,7 @@
                             data_error() |
                             {'error', 'not_found'}.
 open_cache_doc(DbName, DocId, Options) ->
-    case kz_cache:peek_local(?KZ_DATA_CACHE, {?MODULE, DbName, DocId}) of
+    case kzc_cache:peek(?CACHE_NAME, {?MODULE, DbName, DocId}) of
         {'ok', {'error', _}=E} -> E;
         {'ok', _}=Ok -> Ok;
         {'error', 'not_found'} ->
@@ -88,7 +88,7 @@ add_to_doc_cache(DbName, DocId, CacheValue) ->
         'true' ->
            cache_if_not_media(CacheProps, DbName, DocId, CacheValue);
         'false' ->
-            kz_cache:store_local(?KZ_DATA_CACHE, {?MODULE, DbName, DocId}, CacheValue, CacheProps)
+            kzc_cache:store(?CACHE_NAME, {?MODULE, DbName, DocId}, CacheValue, CacheProps)
     end.
 
 -spec cache_if_not_media(wh_proplist(), ne_binary(), ne_binary(), wh_json:object() | data_error()) -> 'ok'.
@@ -105,7 +105,7 @@ cache_if_not_media(CacheProps, DbName, DocId, CacheValue) ->
         <<"media">> -> 'ok';
         <<"private_media">> -> 'ok';
         _Else ->
-            kz_cache:store_local(?KZ_DATA_CACHE, {?MODULE, DbName, DocId}, CacheValue, CacheProps)
+            kzc_cache:store(?CACHE_NAME, {?MODULE, DbName, DocId}, CacheValue, CacheProps)
     end.
 
 -spec flush_cache_doc(ne_binary() | db(), ne_binary() | wh_json:object()) -> 'ok'.
@@ -118,23 +118,24 @@ flush_cache_doc(Db, Doc) when is_binary(Db) ->
 flush_cache_doc(#db{name=Name}, Doc, Options) ->
     flush_cache_doc(wh_util:to_binary(Name), Doc, Options);
 flush_cache_doc(DbName, DocId, _Options) when is_binary(DocId) ->
-    kz_cache:erase_local(?KZ_DATA_CACHE, {?MODULE, DbName, DocId});
+    kzc_cache:erase(?CACHE_NAME, {?MODULE, DbName, DocId});
 flush_cache_doc(DbName, Doc, Options) ->
     flush_cache_doc(DbName, wh_doc:id(Doc), Options).
 
 -spec flush_cache_docs() -> 'ok'.
-flush_cache_docs() -> kz_cache:flush_local(?KZ_DATA_CACHE).
+flush_cache_docs() ->
+    kzc_cache:flush(?CACHE_NAME).
 
 -spec flush_cache_docs(ne_binary() | db()) -> 'ok'.
 flush_cache_docs(#db{name=Name}) ->
     flush_cache_docs(wh_util:to_binary(Name));
 flush_cache_docs(DbName) ->
     Filter = fun({?MODULE, DbName1, _DocId}=K, _) when DbName1 =:= DbName ->
-                     kz_cache:erase_local(?KZ_DATA_CACHE, K),
+                     kzc_cache:erase(?CACHE_NAME, K),
                      'true';
                 (_, _) -> 'false'
              end,
-    _ = kz_cache:filter_local(?KZ_DATA_CACHE, Filter),
+    _ = kzc_cache:filter(?CACHE_NAME, Filter),
     'ok'.
 
 -spec flush_cache_docs(ne_binary() | db(), ne_binaries() | wh_json:objects()) -> 'ok'.

diff --git a/core/kazoo_number_manager/src/kazoo_number_manager.app.src b/core/kazoo_number_manager/src/kazoo_number_manager.app.src
@@ -3,7 +3,7 @@
   {description, "Kazoo Number Management"},
   {vsn, "4.0.0"},
   {modules, []},
-  {registered, [kazoo_number_manager_sup]},
+  {registered, [kazoo_number_manager_cache, kazoo_number_manager_sup]},
   {applications, [ kernel
                  , stdlib
 

diff --git a/core/kazoo_number_manager/src/knm.hrl b/core/kazoo_number_manager/src/knm.hrl
@@ -5,7 +5,7 @@
 -define(APP_VERSION, <<"4.0.0">>).
 -define(APP_NAME, <<"kazoo_number_manager">>).
 
--define(KNM_CACHE, 'knm_cache').
+-define(CACHE_NAME, 'kazoo_number_manager_cache').
 -define(KNM_CONFIG_CAT, <<"number_manager">>).
 
 -define(FEATURE_OUTBOUND_CNAM, <<"outbound_cnam">>).

diff --git a/core/kazoo_number_manager/src/knm_number.erl b/core/kazoo_number_manager/src/knm_number.erl
@@ -591,14 +591,14 @@ lookup_account('undefined') -> {'error', 'not_reconcilable'};
 lookup_account(Num) ->
     NormalizedNum = knm_converters:normalize(Num),
     Key = {'account_lookup', NormalizedNum},
-    case kz_cache:peek_local(?KNM_CACHE, Key) of
+    case kzc_cache:peek(?CACHE_NAME, Key) of
         {'ok', Ok} -> Ok;
         {'error', 'not_found'} ->
             case fetch_account_from_number(NormalizedNum) of
                 {'ok', _, _}=Ok ->
                     NumberDb = knm_converters:to_db(NormalizedNum),
                     CacheProps = [{'origin', [{'db', NumberDb, NormalizedNum}]}],
-                    kz_cache:store_local(?KNM_CACHE, Key, Ok, CacheProps),
+                    kzc_cache:store(?CACHE_NAME, Key, Ok, CacheProps),
                     Ok;
                 Else -> Else
             end