tarsnode add nodename to template

TarsCloud · Nov 12, 2023 · 447a8a7 · 447a8a7
1 parent d5d88bd
commit 447a8a7
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 2 deletions.
diff --git a/NodeServer/CommandLoad.cpp b/NodeServer/CommandLoad.cpp
@@ -465,6 +465,7 @@ int CommandLoad::updateConfigFile(string& sResult)
         mMacro["modulename"] = _desc.application + "." + _desc.serverName;
         mMacro["app"]        = _desc.application;
         mMacro["server"]     = _desc.serverName;
+        mMacro["nodename"]   = PlatformInfo().getNodeName();
         mMacro["serverid"]   = _serverObjectPtr->getServerId();
         mMacro["localip"]    = g_app.getAdapterEndpoint("ServerAdapter").getHost();
         mMacro["exe"]        = TC_File::simplifyDirectory(_exeFile);

diff --git a/NodeServer/NodeServer.cpp b/NodeServer/NodeServer.cpp
@@ -443,7 +443,7 @@ int NodeServer::onUpdateConfig(const string &nodeId, const string &sConfigFile,
 	    sTemplate = TC_Common::replace(sTemplate, "${logpath}", config.get("/tars/application/server<logpath>", "tars"));
         sTemplate = TC_Common::replace(sTemplate, "${localip}",sLocalIp);
 		sTemplate = TC_Common::replace(sTemplate, "${local}", config.get("/tars/application/server<local>", ""));
-		sTemplate = TC_Common::replace(sTemplate, "${modulename}", "tars.tarsnode");
+        sTemplate = TC_Common::replace(sTemplate, "${nodename}", config.get("/tars/application/server<nodename>", ""));
 
 //		cout << TC_Common::outfill("", '-') << endl;
 

diff --git a/deploy/framework/sql/template/tars.default b/deploy/framework/sql/template/tars.default
@@ -30,6 +30,8 @@
         app    = ${app}
         #server name
         server  = ${server}
+        #node name
+        nodename = ${nodename}
         #local ip
         localip  = ${localip}
         #local endpoint, for tars-node comunication(optional)

diff --git a/tarscpp b/tarscpp
+46 −9		servant/libservant/Application.cpp
+67 −6		servant/servant/Application.h