From 32539684194f55a76ec171852f582bdafa4c5631 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Fri, 29 Nov 2013 11:05:51 -0500
Subject: [PATCH] Create a Gitblit aggregate manager delegate for git upload/receive tasks
---
src/main/java/com/gitblit/git/GitDaemon.java | 19 ++++++-------------
1 files changed, 6 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/gitblit/git/GitDaemon.java b/src/main/java/com/gitblit/git/GitDaemon.java
index 40cbe70..a7e7cd5 100644
--- a/src/main/java/com/gitblit/git/GitDaemon.java
+++ b/src/main/java/com/gitblit/git/GitDaemon.java
@@ -67,12 +67,9 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import com.gitblit.Gitblit;
import com.gitblit.IStoredSettings;
import com.gitblit.Keys;
-import com.gitblit.manager.IRepositoryManager;
-import com.gitblit.manager.IRuntimeManager;
-import com.gitblit.manager.ISessionManager;
-import com.gitblit.manager.IUserManager;
import com.gitblit.utils.StringUtils;
/**
@@ -111,13 +108,9 @@
private ReceivePackFactory<GitDaemonClient> receivePackFactory;
- public GitDaemon(
- IRuntimeManager runtimeManager,
- IUserManager userManager,
- ISessionManager sessionManager,
- IRepositoryManager repositoryManager) {
+ public GitDaemon(Gitblit gitblit) {
- IStoredSettings settings = runtimeManager.getSettings();
+ IStoredSettings settings = gitblit.getSettings();
int port = settings.getInteger(Keys.git.daemonPort, 0);
String bindInterface = settings.getString(Keys.git.daemonBindInterface, "localhost");
@@ -127,9 +120,9 @@
myAddress = new InetSocketAddress(bindInterface, port);
}
- repositoryResolver = new RepositoryResolver<GitDaemonClient>(sessionManager, repositoryManager);
- uploadPackFactory = new GitblitUploadPackFactory<GitDaemonClient>(sessionManager);
- receivePackFactory = new GitblitReceivePackFactory<GitDaemonClient>(runtimeManager, userManager, repositoryManager);
+ repositoryResolver = new RepositoryResolver<GitDaemonClient>(gitblit);
+ uploadPackFactory = new GitblitUploadPackFactory<GitDaemonClient>(gitblit);
+ receivePackFactory = new GitblitReceivePackFactory<GitDaemonClient>(gitblit);
run = new AtomicBoolean(false);
processors = new ThreadGroup("Git-Daemon");
--
Gitblit v1.9.1