mirror of
https://github.com/overleaf/overleaf.git
synced 2024-11-21 20:47:08 -05:00
Merge pull request #125 from overleaf/spd-revert-jetty-changes
Revert recent changes to Jetty
This commit is contained in:
Simon Detheridge
GitHub
commit
2e8c1da85a
9 changed files with 3 additions and 46 deletions
|
|
@ -1,7 +1,5 @@
|
|||
{
|
||||
"port": ${GIT_BRIDGE_PORT:-8000},
|
||||
"bindIp": "${GIT_BRIDGE_BIND_IP:-0.0.0.0}",
|
||||
"idleTimeout": ${GIT_BRIDGE_IDLE_TIMEOUT:-600000},
|
||||
"rootGitDirectory": "${GIT_BRIDGE_ROOT_DIR:-/tmp/wlgb}",
|
||||
"apiBaseUrl": "${GIT_BRIDGE_API_BASE_URL:-https://localhost/api/v0}",
|
||||
"postbackBaseUrl": "${GIT_BRIDGE_POSTBACK_BASE_URL:-https://localhost}",
|
||||
|
|
|
|||
|
|
@ -1,7 +1,5 @@
|
|||
{
|
||||
"port": 8080,
|
||||
"bindIp": "127.0.0.1",
|
||||
"idleTimeout": 60000,
|
||||
"rootGitDirectory": "/tmp/wlgb",
|
||||
"apiBaseUrl": "https://localhost/api/v0",
|
||||
"postbackBaseUrl": "https://localhost",
|
||||
|
|
|
|||
|
|
@ -1,7 +1,5 @@
|
|||
{
|
||||
"port": 8000,
|
||||
"bindIp": "0.0.0.0",
|
||||
"idleTimeout": 600000,
|
||||
"rootGitDirectory": "/tmp/wlgb",
|
||||
"apiBaseUrl": "http://v2.overleaf.test:4000/api/v0",
|
||||
"postbackBaseUrl": "http://git-bridge:8000",
|
||||
|
|
|
|||
|
|
@ -76,13 +76,13 @@
|
|||
<dependency>
|
||||
<groupId>org.eclipse.jetty</groupId>
|
||||
<artifactId>jetty-servlet</artifactId>
|
||||
<version>9.4.38.v20210224</version>
|
||||
<version>9.4.8.v20171121</version>
|
||||
</dependency>
|
||||
<!-- https://mvnrepository.com/artifact/org.eclipse.jetty/jetty-server -->
|
||||
<dependency>
|
||||
<groupId>org.eclipse.jetty</groupId>
|
||||
<artifactId>jetty-server</artifactId>
|
||||
<version>9.4.38.v20210224</version>
|
||||
<version>9.4.8.v20171121</version>
|
||||
</dependency>
|
||||
<!-- https://mvnrepository.com/artifact/com.google.code.gson/gson -->
|
||||
<dependency>
|
||||
|
|
|
|||
|
|
@ -24,8 +24,6 @@ public class Config implements JSONSource {
|
|||
static Config asSanitised(Config config) {
|
||||
return new Config(
|
||||
config.port,
|
||||
config.bindIp,
|
||||
config.idleTimeout,
|
||||
config.rootGitDirectory,
|
||||
config.apiBaseURL,
|
||||
config.postbackURL,
|
||||
|
|
@ -39,8 +37,6 @@ public class Config implements JSONSource {
|
|||
}
|
||||
|
||||
private int port;
|
||||
private String bindIp;
|
||||
private int idleTimeout;
|
||||
private String rootGitDirectory;
|
||||
private String apiBaseURL;
|
||||
private String postbackURL;
|
||||
|
|
@ -68,8 +64,6 @@ public class Config implements JSONSource {
|
|||
|
||||
public Config(
|
||||
int port,
|
||||
String bindIp,
|
||||
int idleTimeout,
|
||||
String rootGitDirectory,
|
||||
String apiBaseURL,
|
||||
String postbackURL,
|
||||
|
|
@ -81,8 +75,6 @@ public class Config implements JSONSource {
|
|||
int sqliteHeapLimitBytes
|
||||
) {
|
||||
this.port = port;
|
||||
this.bindIp = bindIp;
|
||||
this.idleTimeout = idleTimeout;
|
||||
this.rootGitDirectory = rootGitDirectory;
|
||||
this.apiBaseURL = apiBaseURL;
|
||||
this.postbackURL = postbackURL;
|
||||
|
|
@ -98,8 +90,6 @@ public class Config implements JSONSource {
|
|||
public void fromJSON(JsonElement json) {
|
||||
JsonObject configObject = json.getAsJsonObject();
|
||||
port = getElement(configObject, "port").getAsInt();
|
||||
bindIp = getElement(configObject, "bindIp").getAsString();
|
||||
idleTimeout = getElement(configObject, "idleTimeout").getAsInt();
|
||||
rootGitDirectory = getElement(
|
||||
configObject,
|
||||
"rootGitDirectory"
|
||||
|
|
@ -141,14 +131,6 @@ public class Config implements JSONSource {
|
|||
return port;
|
||||
}
|
||||
|
||||
public String getBindIp() {
|
||||
return bindIp;
|
||||
}
|
||||
|
||||
public int getIdleTimeout() {
|
||||
return idleTimeout;
|
||||
}
|
||||
|
||||
public String getRootGitDirectory() {
|
||||
return rootGitDirectory;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@ package uk.ac.ic.wlgitbridge.server;
|
|||
|
||||
import org.eclipse.jetty.server.Handler;
|
||||
import org.eclipse.jetty.server.Server;
|
||||
import org.eclipse.jetty.server.ServerConnector;
|
||||
import org.eclipse.jetty.server.handler.*;
|
||||
import org.eclipse.jetty.servlet.FilterHolder;
|
||||
import org.eclipse.jetty.servlet.ServletContextHandler;
|
||||
|
|
@ -73,7 +72,7 @@ public class GitBridgeServer {
|
|||
swapStore,
|
||||
snapshotApi
|
||||
);
|
||||
jettyServer = new Server();
|
||||
jettyServer = new Server(port);
|
||||
configureJettyServer(config, repoStore, snapshotApi);
|
||||
apiBaseURL = config.getAPIBaseURL();
|
||||
SnapshotAPIRequest.setBaseURL(apiBaseURL);
|
||||
|
|
@ -115,12 +114,6 @@ public class GitBridgeServer {
|
|||
RepoStore repoStore,
|
||||
SnapshotApi snapshotApi
|
||||
) throws ServletException {
|
||||
ServerConnector connector = new ServerConnector(this.jettyServer);
|
||||
connector.setPort(config.getPort());
|
||||
connector.setHost(config.getBindIp());
|
||||
connector.setIdleTimeout(config.getIdleTimeout());
|
||||
this.jettyServer.addConnector(connector);
|
||||
|
||||
HandlerCollection handlers = new HandlerList();
|
||||
handlers.addHandler(initApiHandler());
|
||||
handlers.addHandler(initBaseHandler());
|
||||
|
|
|
|||
|
|
@ -1063,8 +1063,6 @@ public class WLGitBridgeIntegrationTest {
|
|||
String cfgStr =
|
||||
"{\n" +
|
||||
" \"port\": " + port + ",\n" +
|
||||
" \"bindIp\": \"127.0.0.1\",\n" +
|
||||
" \"idleTimeout\": 30000,\n" +
|
||||
" \"rootGitDirectory\": \"" +
|
||||
wlgb.getAbsolutePath() +
|
||||
"\",\n" +
|
||||
|
|
|
|||
|
|
@ -16,8 +16,6 @@ public class ConfigTest {
|
|||
public void testConstructWithOauth() {
|
||||
Reader reader = new StringReader("{\n" +
|
||||
" \"port\": 80,\n" +
|
||||
" \"bindIp\": \"127.0.0.1\",\n" +
|
||||
" \"idleTimeout\": 30000,\n" +
|
||||
" \"rootGitDirectory\": \"/var/wlgb/git\",\n" +
|
||||
" \"apiBaseUrl\": \"http://127.0.0.1:60000/api/v0\",\n" +
|
||||
" \"postbackBaseUrl\": \"http://127.0.0.1\",\n" +
|
||||
|
|
@ -44,8 +42,6 @@ public class ConfigTest {
|
|||
public void testConstructWithoutOauth() {
|
||||
Reader reader = new StringReader("{\n" +
|
||||
" \"port\": 80,\n" +
|
||||
" \"bindIp\": \"127.0.0.1\",\n" +
|
||||
" \"idleTimeout\": 30000,\n" +
|
||||
" \"rootGitDirectory\": \"/var/wlgb/git\",\n" +
|
||||
" \"apiBaseUrl\": \"http://127.0.0.1:60000/api/v0\",\n" +
|
||||
" \"postbackBaseUrl\": \"http://127.0.0.1\",\n" +
|
||||
|
|
@ -66,8 +62,6 @@ public class ConfigTest {
|
|||
public void asSanitised() throws Exception {
|
||||
Reader reader = new StringReader("{\n" +
|
||||
" \"port\": 80,\n" +
|
||||
" \"bindIp\": \"127.0.0.1\",\n" +
|
||||
" \"idleTimeout\": 30000,\n" +
|
||||
" \"rootGitDirectory\": \"/var/wlgb/git\",\n" +
|
||||
" \"apiBaseUrl\": \"http://127.0.0.1:60000/api/v0\",\n" +
|
||||
" \"postbackBaseUrl\": \"http://127.0.0.1\",\n" +
|
||||
|
|
@ -81,8 +75,6 @@ public class ConfigTest {
|
|||
Config config = new Config(reader);
|
||||
String expected = "{\n" +
|
||||
" \"port\": 80,\n" +
|
||||
" \"bindIp\": \"127.0.0.1\",\n" +
|
||||
" \"idleTimeout\": 30000,\n" +
|
||||
" \"rootGitDirectory\": \"/var/wlgb/git\",\n" +
|
||||
" \"apiBaseURL\": \"http://127.0.0.1:60000/api/v0/\",\n" +
|
||||
" \"postbackURL\": \"http://127.0.0.1/\",\n" +
|
||||
|
|
|
|||
|
|
@ -53,8 +53,6 @@ public class BridgeTest {
|
|||
gcJob = mock(GcJob.class);
|
||||
bridge = new Bridge(
|
||||
new Config(
|
||||
0,
|
||||
"",
|
||||
0,
|
||||
"",
|
||||
"",
|
||||
|
|
|
|||
Loading…
Reference in a new issue