fix compiler bug in master-slave mode

TarsCloud · Dec 8, 2023 · 53c5afa · 53c5afa
1 parent e885217
commit 53c5afa
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 67 deletions.
diff --git a/LogServer/JsonTr.h b/LogServer/JsonTr.h
diff --git a/LogServer/TraceService.cpp b/LogServer/TraceService.cpp
@@ -12,9 +12,6 @@
 
 void TraceService::initialize(TC_Config &config)
 {
-
-    //auto &&config = getConfig();
-
     string message{};
 	if (!loadTimerValue(config, message))
 	{
@@ -66,7 +63,6 @@ void TraceService::initialize(TC_Config &config)
 	});
 	timerThread_.detach();
 
-
 	TimerTaskQueue::instance().pushCycleTask(
 			[this](const size_t&, size_t&)
 			{
@@ -78,7 +74,8 @@ void TraceService::initialize(TC_Config &config)
 				}
 			}, 0, 1);
 
-	ESWriter::createIndexTemplate();
+    ESWriter::createIndexTemplate();
+    TLOG_DEBUG("Initialize succ" << endl);
 };
 
 bool TraceService::loadTimerValue(const TC_Config& config, string& message)

diff --git a/RegistryServer/QueryImp.h b/RegistryServer/QueryImp.h
@@ -86,6 +86,28 @@ class QueryImp: public QueryF
      */
     Int32 findObjectByIdInSameSet(const std::string & id,const std::string & setId,vector<EndpointF> &activeEp,vector<EndpointF> &inactiveEp, CurrentPtr current);
 
+    /** 注册id变化的通知, 通知时会通知所有的变化内容(企业版功能)
+     *
+     * @param ids         对象名称
+     * @param name       当前模块名称
+     * @return:  0-成功  others-失败
+     */
+    Int32 registerChange(const vector<string> &ids, const string &name, CurrentPtr current) { return -1; };
+
+    /** 注册id变化的通知, 通知时后需要自己主动find(企业版功能)
+     *
+     * @param id         对象名称
+     * @param name       当前模块名称
+     * @return:  0-成功  others-失败
+     */
+    Int32 registerQuery(const string &id, const string &name, CurrentPtr current) { return -1; };
+
+    /**
+     * 获取锁, 实现业务服务一主多备的模式(企业版功能)
+     * @return 0: 获取锁成功； 1：获取锁失败； 2： 数据异常， -1：其他异常
+     */
+    Int32 getLocker(const tars::GetMasterSlaveLock &req, CurrentPtr current) { return -1;};
+
 private:
     /**
      * 打印按天日志

diff --git a/tarscpp b/tarscpp
+3 −0		servant/libservant/AdapterProxy.cpp
+185 −59		servant/libservant/Application.cpp
+10 −10		servant/libservant/EndpointManager.cpp
+71 −63		servant/libservant/RemoteConfig.cpp
+4 −4		servant/libservant/RemoteNotify.cpp
+1 −1		servant/libservant/ServantHandle.cpp
+5 −0		servant/libservant/ServantProxy.cpp
+1 −1		servant/protocol
+46 −14		servant/servant/Application.h
+2 −2		servant/servant/KeepAliveNodeF.h
+11 −6		servant/servant/RemoteConfig.h
+64 −1		unit-test/rpc/test_win_server.cpp
+3 −1		unit-test/server/FrameworkServer.cpp
+1 −0		unit-test/server/WinServer.cpp
+1 −1		unit-test/server/framework.conf
+11 −0		unit-test/server/framework/ConfigImp.cpp
+13 −2		unit-test/server/framework/ConfigImp.h
+0 −1		unit-test/server/framework/DbHandle.cpp
+24 −0		unit-test/server/framework/QueryImp.h
+0 −2		unit-test/server/windows.conf
+98 −0		unit-test/util/test_tc_option.cpp
+6 −0		util/include/util/tc_option.h
+1 −1		util/src/tc_epoll_server.cpp
+2 −2		util/src/tc_gzip.cpp
+34 −1		util/src/tc_option.cpp
+3 −2		util/src/tc_transceiver.cpp