(trafficserver) branch master updated: jsonrpc - Make sure we do not start the rpc server when ats runs on command mode.(#11888)

[dmeden]

This is an automated email from the ASF dual-hosted git repository.

dmeden pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficserver.git


The following commit(s) were added to refs/heads/master by this push:
     new b65a8418d7 jsonrpc -  Make sure we do not start the rpc server when 
ats runs on command mode.(#11888)
b65a8418d7 is described below

commit b65a8418d73afe49b514f14180ba592f4697d23b
Author: Damian Meden <dme...@apache.org>
AuthorDate: Tue Dec 3 09:30:10 2024 +0100

    jsonrpc -  Make sure we do not start the rpc server when ats runs on 
command mode.(#11888)
---
 include/mgmt/rpc/server/IPCSocketServer.h | 1 -
 src/mgmt/rpc/server/IPCSocketServer.cc    | 5 -----
 src/traffic_server/traffic_server.cc      | 8 +++++---
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/include/mgmt/rpc/server/IPCSocketServer.h 
b/include/mgmt/rpc/server/IPCSocketServer.h
index 5a9bda39ac..4c39cf165f 100644
--- a/include/mgmt/rpc/server/IPCSocketServer.h
+++ b/include/mgmt/rpc/server/IPCSocketServer.h
@@ -93,7 +93,6 @@ class IPCSocketServer : public BaseCommInterface
 
 public:
   IPCSocketServer() = default;
-  virtual ~IPCSocketServer() override;
 
   /// Configure the  local socket.
   bool configure(YAML::Node const &params) override;
diff --git a/src/mgmt/rpc/server/IPCSocketServer.cc 
b/src/mgmt/rpc/server/IPCSocketServer.cc
index 38203272fe..26bcfa7b31 100644
--- a/src/mgmt/rpc/server/IPCSocketServer.cc
+++ b/src/mgmt/rpc/server/IPCSocketServer.cc
@@ -124,11 +124,6 @@ get_peereid(int fd, uid_t *euid, gid_t *egid)
 
 namespace rpc::comm
 {
-IPCSocketServer::~IPCSocketServer()
-{
-  unlink(_conf.sockPathName.c_str());
-}
-
 bool
 IPCSocketServer::configure(YAML::Node const &params)
 {
diff --git a/src/traffic_server/traffic_server.cc 
b/src/traffic_server/traffic_server.cc
index 12482c76d1..8cfac90226 100644
--- a/src/traffic_server/traffic_server.cc
+++ b/src/traffic_server/traffic_server.cc
@@ -1997,9 +1997,11 @@ main(int /* argc ATS_UNUSED */, const char **argv)
   extern int gSystemClock; // 0 == CLOCK_REALTIME, the default
   REC_ReadConfigInteger(gSystemClock, "proxy.config.system_clock");
 
-  // JSONRPC server and handlers
-  if (auto &&[ok, msg] = initialize_jsonrpc_server(); !ok) {
-    Warning("JSONRPC server could not be started.\n  Why?: '%s' ... Continuing 
without it.", msg.c_str());
+  if (!command_flag) { // No need if we are going into command mode.
+    // JSONRPC server and handlers
+    if (auto &&[ok, msg] = initialize_jsonrpc_server(); !ok) {
+      Warning("JSONRPC server could not be started.\n  Why?: '%s' ... 
Continuing without it.", msg.c_str());
+    }
   }
 
   // setup callback for tracking remap included files