aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/main/java/com/google/devtools/build/lib/server/RPCServer.java
diff options
context:
space:
mode:
authorGravatar Lukacs Berki <lberki@google.com>2016-04-26 11:40:24 +0000
committerGravatar Yun Peng <pcloudy@google.com>2016-04-26 14:39:30 +0000
commitd9da60f49d367e935307f71b8f1aa2c03b7aa20b (patch)
treed430a871b01f4d8209ad981d8e114b522db2b23c /src/main/java/com/google/devtools/build/lib/server/RPCServer.java
parent2b0b5cc078e9acc4f9b4908fb6c835119f295ce1 (diff)
Revert server.pid to be a symlink so that old server version can shut down new ones.
Add server.pid.txt that contains the same information in text form. ExecuteDaemon() on Windows will simply not write server.pid . -- MOS_MIGRATED_REVID=120802055
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/server/RPCServer.java')
-rw-r--r--src/main/java/com/google/devtools/build/lib/server/RPCServer.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/server/RPCServer.java b/src/main/java/com/google/devtools/build/lib/server/RPCServer.java
index 8e71477b49..ad7c9d1377 100644
--- a/src/main/java/com/google/devtools/build/lib/server/RPCServer.java
+++ b/src/main/java/com/google/devtools/build/lib/server/RPCServer.java
@@ -42,8 +42,10 @@ public abstract class RPCServer {
// server.pid was written in the C++ launcher after fork() but before exec() .
// The client only accesses the pid file after connecting to the socket
// which ensures that it gets the correct pid value.
- Path pidFile = serverDirectory.getRelative("server.pid");
+ Path pidFile = serverDirectory.getRelative("server.pid.txt");
+ Path pidSymlink = serverDirectory.getRelative("server.pid");
RPCServer.deleteAtExit(pidFile, /*deleteParent=*/ false);
+ RPCServer.deleteAtExit(pidSymlink, /*deleteParent=*/ false);
}
/**