From 2e9b709c198fa9dd7eac6b38bc58b847dbaf4ca1 Mon Sep 17 00:00:00 2001 From: DLive Date: Fri, 3 May 2019 21:02:19 +0800 Subject: [PATCH] fix module rename process supervisor ref --- src/dubbo_agent.erl | 20 -------------------- src/dubbo_id_generator.erl | 2 +- src/dubboerl_sup.erl | 2 +- src/type_register.erl | 12 ++++++------ test/consumer_SUITE.erl | 3 ++- test/dubbo_service_app.erl | 2 +- 6 files changed, 11 insertions(+), 30 deletions(-) delete mode 100644 src/dubbo_agent.erl diff --git a/src/dubbo_agent.erl b/src/dubbo_agent.erl deleted file mode 100644 index 15e557a..0000000 --- a/src/dubbo_agent.erl +++ /dev/null @@ -1,20 +0,0 @@ -%%%------------------------------------------------------------------- -%%% @author dlive -%%% @copyright (C) 2018, -%%% @doc -%%% -%%% @end -%%% Created : 11. May 2018 12:15 AM -%%%------------------------------------------------------------------- --module(dubbo_agent). --author("dlive"). - -%% API --export([register_consumer/1]). - -register_consumer(Interface)-> - ProviderList=[ - "dubbo%3a%2f%2f127.0.0.1%3a20880%2fcom.alibaba.dubbo.performance.demo.provider.IHelloService%3fanyhost%3dtrue%26application%3dmesh-provider%26dubbo%3d2.6%26executes%3d30%26interface%3dcom.alibaba.dubbo.performance.demo.provider.IHelloService%26methods%3dhash%26pid%3d26029%26side%3dprovider%26timestamp%3d1514615143388" - ], - dubbo_consumer_pool:start_consumer(Interface,ProviderList), - ok. diff --git a/src/dubbo_id_generator.erl b/src/dubbo_id_generator.erl index 2db23e4..a97406d 100644 --- a/src/dubbo_id_generator.erl +++ b/src/dubbo_id_generator.erl @@ -24,7 +24,7 @@ -export([gen_id/0,get_index/2]). -define(SERVER, ?MODULE). --define(INDEX_ETS_TABLE,de_id_count_table). +-define(INDEX_ETS_TABLE,dubbo_id_count_table). -define(MAX_NUM,9223372036854775807). -record(state, {}). diff --git a/src/dubboerl_sup.erl b/src/dubboerl_sup.erl index 4e42308..556aa7e 100644 --- a/src/dubboerl_sup.erl +++ b/src/dubboerl_sup.erl @@ -31,7 +31,7 @@ start_link() -> init([]) -> ZK = {dubbo_zookeeper,{dubbo_zookeeper, start_link, []},transient,5000,worker,[dubbo_zookeeper]}, %% NettySer = {dubbo_netty_client,{dubbo_netty_client, start_link, []},transient,5000,worker,[dubbo_netty_client]}, - Id_count = {de_id_count,{de_id_count, start_link, []},transient,5000,worker,[de_id_count]}, + Id_count = {dubbo_id_generator,{dubbo_id_generator, start_link, []},transient,5000,worker,[dubbo_id_generator]}, ProviderPoolSup = {dubbo_provider_worker_sup,{dubbo_provider_worker_sup, start_link, []},transient,5000,supervisor,[dubbo_provider_worker_sup]}, ConsumerPoolSup = {dubbo_consumer_pool_sup,{dubbo_consumer_pool_sup, start_link, []},transient,5000,supervisor,[dubbo_consumer_pool_sup]}, ConsumerPool = {dubbo_consumer_pool,{dubbo_consumer_pool, start_link, []},transient,5000,worker,[dubbo_consumer_pool]}, diff --git a/src/type_register.erl b/src/type_register.erl index 2e22831..4dc52cf 100644 --- a/src/type_register.erl +++ b/src/type_register.erl @@ -17,19 +17,19 @@ init()-> case ets:info(?FOREIGN_NATIVE_TABLE) of undefined -> - io:format("init decoding foreign_native_table table pid ~p~n",[self()]), - ets:new(?FOREIGN_NATIVE_TABLE,[public,named_table]); %% public + ?FOREIGN_NATIVE_TABLE = ets:new(?FOREIGN_NATIVE_TABLE,[public,named_table]), + logger:info("init decoding foreign_native_table table",[]); _ -> ets:delete(?FOREIGN_NATIVE_TABLE), - ets:new(?FOREIGN_NATIVE_TABLE,[public,named_table]) + ?FOREIGN_NATIVE_TABLE = ets:new(?FOREIGN_NATIVE_TABLE,[public,named_table]) end, case ets:info(?NATIVE_FOREIGN_TABLE) of undefined -> - io:format("init decoding foreign_native_table table pid ~p~n",[self()]), - ets:new(?NATIVE_FOREIGN_TABLE,[public,named_table]); %% public + io:format("init decoding native_foreign_table table pid ~p~n",[self()]), + ?NATIVE_FOREIGN_TABLE = ets:new(?NATIVE_FOREIGN_TABLE,[public,named_table]); %% public _ -> ets:delete(?NATIVE_FOREIGN_TABLE), - ets:new(?NATIVE_FOREIGN_TABLE,[public,named_table]) + ?NATIVE_FOREIGN_TABLE = ets:new(?NATIVE_FOREIGN_TABLE,[public,named_table]) end, ok. diff --git a/test/consumer_SUITE.erl b/test/consumer_SUITE.erl index f6cf0d3..786c519 100644 --- a/test/consumer_SUITE.erl +++ b/test/consumer_SUITE.erl @@ -30,7 +30,8 @@ suite() -> %% Reason = term() %%-------------------------------------------------------------------- init_per_suite(Config) -> - application:ensure_all_started(dubboerl), + Start = application:ensure_all_started(dubboerl), + io:format(user,"test case start info ~p~n",[Start]), Config. %%-------------------------------------------------------------------- diff --git a/test/dubbo_service_app.erl b/test/dubbo_service_app.erl index fdd839c..8f9d336 100644 --- a/test/dubbo_service_app.erl +++ b/test/dubbo_service_app.erl @@ -35,6 +35,6 @@ register_type_list()-> List = dubbo_service_type_list:get_list(), lists:map( fun({NativeType,ForeignType,Fields}) -> - de_type_transfer:pre_process_typedef(NativeType,ForeignType,Fields) + dubbo_type_transfer:pre_process_typedef(NativeType,ForeignType,Fields) end,List), ok. \ No newline at end of file