Skip to content

Commit b65a841

Browse files
authored
jsonrpc - Make sure we do not start the rpc server when ats runs on command mode.(#11888)
1 parent 0dce0e5 commit b65a841

File tree

3 files changed

+5
-9
lines changed

3 files changed

+5
-9
lines changed

include/mgmt/rpc/server/IPCSocketServer.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,6 @@ class IPCSocketServer : public BaseCommInterface
9393

9494
public:
9595
IPCSocketServer() = default;
96-
virtual ~IPCSocketServer() override;
9796

9897
/// Configure the local socket.
9998
bool configure(YAML::Node const &params) override;

src/mgmt/rpc/server/IPCSocketServer.cc

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -124,11 +124,6 @@ get_peereid(int fd, uid_t *euid, gid_t *egid)
124124

125125
namespace rpc::comm
126126
{
127-
IPCSocketServer::~IPCSocketServer()
128-
{
129-
unlink(_conf.sockPathName.c_str());
130-
}
131-
132127
bool
133128
IPCSocketServer::configure(YAML::Node const &params)
134129
{

src/traffic_server/traffic_server.cc

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1997,9 +1997,11 @@ main(int /* argc ATS_UNUSED */, const char **argv)
19971997
extern int gSystemClock; // 0 == CLOCK_REALTIME, the default
19981998
REC_ReadConfigInteger(gSystemClock, "proxy.config.system_clock");
19991999

2000-
// JSONRPC server and handlers
2001-
if (auto &&[ok, msg] = initialize_jsonrpc_server(); !ok) {
2002-
Warning("JSONRPC server could not be started.\n Why?: '%s' ... Continuing without it.", msg.c_str());
2000+
if (!command_flag) { // No need if we are going into command mode.
2001+
// JSONRPC server and handlers
2002+
if (auto &&[ok, msg] = initialize_jsonrpc_server(); !ok) {
2003+
Warning("JSONRPC server could not be started.\n Why?: '%s' ... Continuing without it.", msg.c_str());
2004+
}
20032005
}
20042006

20052007
// setup callback for tracking remap included files

0 commit comments

Comments
 (0)