opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.6' into stable-2.7

Browse Source 
* stable-2.6:
  Bump openid4java dependency to 0.9.8
  Provide direct link to REST API documentation
  init: Gracefully handle missing browser
  Improve explanation of path conflicts in project config doc
  init: Don't set username on upgrade if database.type is JDBC
This commit is contained in:
Shawn Pearce
2013-05-14 15:33:06 -07:00
parent a6678bff25 be320a9de5
commit f0cb7cb93c
9 changed files with 44 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/Browser.java
View File

@@ -14,6 +14,7 @@
package com.google.gerrit.pgm.init;
import com.google.common.base.Strings;
import com.google.gerrit.server.config.GerritServerConfig;
import com.google.inject.Inject;
@@ -42,7 +43,6 @@ public class Browser {
if (url == null) {
return;
}
if (url.startsWith("proxy-")) {
url = url.substring("proxy-".length());
}
@@ -54,15 +54,19 @@ public class Browser {
System.err.println("error: invalid httpd.listenUrl: " + url);
return;
}
final String hostname = uri.getHost();
final int port = InitUtil.portOf(uri);
waitForServer(uri);
openBrowser(uri, link);
}
System.err.print("Waiting for server to start ... ");
private void waitForServer(URI uri) throws IOException {
String host = uri.getHost();
int port = InitUtil.portOf(uri);
System.err.format("Waiting for server on %s:%d ... ", host, port);
System.err.flush();
for (;;) {
final Socket s;
Socket s;
try {
s = new Socket(hostname, port);
s = new Socket(host, port);
} catch (IOException e) {
try {
Thread.sleep(100);
@@ -74,18 +78,33 @@ public class Browser {
break;
}
System.err.println("OK");
}
url = cfg.getString("gerrit", null, "canonicalWebUrl");
if (url == null || url.isEmpty()) {
private String resolveUrl(URI uri, String link) {
String url = cfg.getString("gerrit", null, "canonicalWebUrl");
if (Strings.isNullOrEmpty(url)) {
url = uri.toString();
}
if (!url.endsWith("/")) {
url += "/";
}
if (link != null && !link.isEmpty()) {
if (!Strings.isNullOrEmpty(link)) {
url += "#" + link;
}
System.err.println("Opening browser ...");
org.h2.tools.Server.openBrowser(url);
return url;
}
private void openBrowser(URI uri, String link) {
String url = resolveUrl(uri, link);
System.err.format("Opening %s ...", url);
System.err.flush();
try {
org.h2.tools.Server.openBrowser(url);
System.err.println("OK");
} catch (Exception e) {
System.err.println("FAILED");
System.err.println("Open Gerrit with a JavaScript capable browser:");
System.err.println(" " + url);
}
}
}

3
gerrit-pgm/src/main/java/com/google/gerrit/pgm/init/JDBCInitializer.java
View File

@@ -21,10 +21,11 @@ import com.google.common.base.Strings;
class JDBCInitializer implements DatabaseConfigInitializer {
@Override
public void initConfig(Section database) {
boolean hasUrl = Strings.emptyToNull(database.get("url")) != null;
database.string("URL", "url", null);
guessDriver(database);
database.string("Driver class name", "driver", null);
database.string("Database username", "username", username());
database.string("Database username", "username", hasUrl ? null : username());
database.password("username", "password");
}