Update NailGun to a version that supports a configurable client disconnection timeout.
Summary:
Update nailgun to 5915c1f84c70dc763627dfde549c7ab07d712164,
modify buckd script to pass timeout to NailGun server.
Test Plan:
0) buck test --all
1) buckd
2) buck build buck, check that it completes
3) modify buckd script to set BUCKD_CLIENT_TIMEOUT_MILLIS to 500
4) buckd
5) buck build buck, check that build exits with "Client disconnected." message.
diff --git a/bin/buckd b/bin/buckd
index 13bd1ec..3171097 100755
--- a/bin/buckd
+++ b/bin/buckd
@@ -36,10 +36,12 @@
echo $BUCKD_PORT > "$BUCKD_PORT_FILE"
# Run buckd.
+BUCKD_CLIENT_TIMEOUT_MILLIS=10000
java \
$BUCK_JAVA_ARGS \
-classpath \
${BUCK_JAVA_CLASSPATH} \
-com.martiansoftware.nailgun.NGServer localhost:${BUCKD_PORT} \
+com.martiansoftware.nailgun.NGServer \
+localhost:${BUCKD_PORT} $BUCKD_CLIENT_TIMEOUT_MILLIS \
&> $BUCKD_LOG_FILE &
echo $! > "$BUCKD_PID_FILE"
diff --git a/lib/nailgun-server-0.9.2-SNAPSHOT-sources.jar b/lib/nailgun-server-0.9.2-SNAPSHOT-sources.jar
index 4513f48..744c493 100644
--- a/lib/nailgun-server-0.9.2-SNAPSHOT-sources.jar
+++ b/lib/nailgun-server-0.9.2-SNAPSHOT-sources.jar
Binary files differ
diff --git a/lib/nailgun-server-0.9.2-SNAPSHOT.jar b/lib/nailgun-server-0.9.2-SNAPSHOT.jar
index 308dd9f..01cc39a 100644
--- a/lib/nailgun-server-0.9.2-SNAPSHOT.jar
+++ b/lib/nailgun-server-0.9.2-SNAPSHOT.jar
Binary files differ
diff --git a/test/com/facebook/buck/cli/DaemonIntegrationTest.java b/test/com/facebook/buck/cli/DaemonIntegrationTest.java
index 03d37e3..97841a9 100644
--- a/test/com/facebook/buck/cli/DaemonIntegrationTest.java
+++ b/test/com/facebook/buck/cli/DaemonIntegrationTest.java
@@ -143,7 +143,7 @@
public NGClientListener listener = null;
public TestNGInputStream(InputStream in, DataOutputStream out, PrintStream serverLog) {
- super(in, out, serverLog);
+ super(in, out, serverLog, 10000 /* client timeout millis */);
}
@Override
diff --git a/third-party/nailgun/README.md b/third-party/nailgun/README.md
index df471ba..24b36be 100644
--- a/third-party/nailgun/README.md
+++ b/third-party/nailgun/README.md
@@ -17,4 +17,4 @@
For more information, see [the nailgun website](http://martiansoftware.com/nailgun/).
Buck currently uses https://github.com/martylamb/nailgun at
-fcc24ecd63ead63f160e96f6a0640f6b4280f72d
+5915c1f84c70dc763627dfde549c7ab07d712164
