aboutsummaryrefslogtreecommitdiff
path: root/nailgun_launcher/NailgunLauncher.java
diff options
context:
space:
mode:
authorBenjamin Frank <ben+github@pipsfrank.de>2016-07-05 21:40:33 +0200
committerBenjamin Frank <ben+github@pipsfrank.de>2016-07-06 11:06:28 +0200
commitc8733351614bed77bd72708fdb12b36268cb2a28 (patch)
tree60e069857eefee238406202a1a0ba4e690017025 /nailgun_launcher/NailgunLauncher.java
parent11342ecc8c6bd92e73b8ad9a2791f8d9462043a6 (diff)
downloadcbt-c8733351614bed77bd72708fdb12b36268cb2a28.tar.gz
cbt-c8733351614bed77bd72708fdb12b36268cb2a28.tar.bz2
cbt-c8733351614bed77bd72708fdb12b36268cb2a28.zip
Support proxy settings in CBT.
Proxy settings can be supplied either via Java system-properties or via environment variables (http_proxy/https_proxy/no_proxy). Java system-properties take precedence over env vars. Evaluation of proxy settings happens only during nailgun startup for now.
Diffstat (limited to 'nailgun_launcher/NailgunLauncher.java')
-rw-r--r--nailgun_launcher/NailgunLauncher.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/nailgun_launcher/NailgunLauncher.java b/nailgun_launcher/NailgunLauncher.java
index c909c12..159041f 100644
--- a/nailgun_launcher/NailgunLauncher.java
+++ b/nailgun_launcher/NailgunLauncher.java
@@ -54,6 +54,7 @@ public class NailgunLauncher{
return;
}
+ installProxySettings();
String[] diff = args[0].split("\\.");
long start = _start - (Long.parseLong(diff[0]) * 1000L) - Long.parseLong(diff[1]);