opendev/gerrit
Code Issues Proposed changes

init: Refactor init to be small parts created through Guice

Browse Source 
I was nuts when I wrote init.  Making it all one giant program
in a single class was simply insane.  Instead we break it down
into many smaller classes and use Guice to manage the creation,
dependency injection, and control flow.

Since init knew about most of the Files under the $site_path we put
them all into a single immutable class called SitePaths and replace
all references to these throughout the code base to use SitePaths
and these well defined constants.

init can now also import GerritServer.properties into the newer
style gerrit.config and secure.config.  This ensure the database
settings are setup with the current defaults

Change-Id: I4f5d8256497c1a97df35754dbe6193c78edde9e1
Signed-off-by: Shawn O. Pearce <sop@google.com>
This commit is contained in:
Shawn O. Pearce
2009-12-17 12:16:45 -08:00
parent 2fdaabd50e
commit bbf1aaccde
42 changed files with 2506 additions and 1404 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
gerrit-server/src/main/java/com/google/gerrit/server/cache/CachePool.java vendored
View File

@@ -20,7 +20,7 @@ import static java.util.concurrent.TimeUnit.SECONDS;
import com.google.gerrit.lifecycle.LifecycleListener;
import com.google.gerrit.server.config.ConfigUtil;
import com.google.gerrit.server.config.GerritServerConfig;
import com.google.gerrit.server.config.SitePath;
import com.google.gerrit.server.config.SitePaths;
import com.google.inject.Inject;
import com.google.inject.ProvisionException;
import com.google.inject.Singleton;
@@ -31,9 +31,9 @@ import net.sf.ehcache.config.Configuration;
import net.sf.ehcache.config.DiskStoreConfiguration;
import net.sf.ehcache.store.MemoryStoreEvictionPolicy;
import org.eclipse.jgit.lib.Config;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.eclipse.jgit.lib.Config;
import java.io.File;
import java.util.HashMap;
@@ -64,16 +64,16 @@ public class CachePool {
}
private final Config config;
private final File sitePath;
private final SitePaths site;
private final Object lock = new Object();
private final Map<String, CacheProvider<?, ?>> caches;
private CacheManager manager;
@Inject
CachePool(@GerritServerConfig final Config cfg, @SitePath final File sitePath) {
CachePool(@GerritServerConfig final Config cfg, final SitePaths site) {
this.config = cfg;
this.sitePath = sitePath;
this.site = site;
this.caches = new HashMap<String, CacheProvider<?, ?>>();
}
@@ -198,16 +198,9 @@ public class CachePool {
return;
}
String path = config.getString("cache", null, "directory");
if (path == null || path.length() == 0) {
return;
}
File loc = new File(path);
if (!loc.isAbsolute()) {
loc = new File(sitePath, path);
}
if (loc.exists() || loc.mkdirs()) {
File loc = site.resolve(config.getString("cache", null, "directory"));
if (loc == null) {
} else if (loc.exists() || loc.mkdirs()) {
if (loc.canWrite()) {
final DiskStoreConfiguration c = new DiskStoreConfiguration();
c.setPath(loc.getAbsolutePath());