You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by la...@apache.org on 2015/04/12 15:00:51 UTC
[2/3] stratos git commit: Formatting cartridge agent module
Formatting cartridge agent module
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/7519ffcd
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/7519ffcd
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/7519ffcd
Branch: refs/heads/master
Commit: 7519ffcd7e611f08405611aa6be844cbf6a3eaed
Parents: f533b5b
Author: Lahiru Sandaruwan <la...@apache.org>
Authored: Sun Apr 12 18:29:52 2015 +0530
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Sun Apr 12 18:29:52 2015 +0530
----------------------------------------------------------------------
.../org.apache.stratos.cartridge.agent/pom.xml | 20 +-
.../stratos/cartridge/agent/CartridgeAgent.java | 74 ++--
.../agent/CartridgeAgentEventListeners.java | 173 +++++----
.../apache/stratos/cartridge/agent/Main.java | 2 +-
.../synchronizer/RepositoryInformation.java | 97 ++---
.../git/impl/GitBasedArtifactRepository.java | 156 ++++----
.../CustomJschConfigSessionFactory.java | 6 +-
.../git/internal/RepositoryContext.java | 26 +-
.../synchronizer/git/util/Utilities.java | 13 +-
.../config/CartridgeAgentConfiguration.java | 213 ++++++-----
.../agent/data/publisher/DataContext.java | 12 +-
.../agent/data/publisher/DataPublisher.java | 8 +-
.../publisher/DataPublisherConfiguration.java | 16 +-
.../data/publisher/GenericDataPublisher.java | 6 +-
.../agent/data/publisher/log/Constants.java | 4 +-
.../publisher/log/FileBasedLogPublisher.java | 12 +-
.../agent/data/publisher/log/LogPublisher.java | 6 +-
.../data/publisher/log/LogPublisherManager.java | 96 ++---
.../publisher/CartridgeAgentEventPublisher.java | 378 +++++++++----------
.../extensions/DefaultExtensionHandler.java | 22 +-
.../agent/extensions/ExtensionHandler.java | 12 +-
.../publisher/CartridgeStatistics.java | 2 +-
.../publisher/HealthStatisticsNotifier.java | 45 +--
.../publisher/HealthStatisticsReader.java | 112 +++---
.../publisher/IHealthStatisticsReader.java | 8 +-
.../statistics/publisher/PluginLoader.java | 62 ++-
.../agent/util/CartridgeAgentConstants.java | 18 +-
.../agent/util/CartridgeAgentUtils.java | 29 +-
.../cartridge/agent/util/ExtensionUtils.java | 22 +-
.../agent/test/JavaCartridgeAgentTest.java | 16 +-
30 files changed, 827 insertions(+), 839 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/7519ffcd/components/org.apache.stratos.cartridge.agent/pom.xml
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cartridge.agent/pom.xml b/components/org.apache.stratos.cartridge.agent/pom.xml
index 737897c..5e25e64 100644
--- a/components/org.apache.stratos.cartridge.agent/pom.xml
+++ b/components/org.apache.stratos.cartridge.agent/pom.xml
@@ -34,16 +34,16 @@
<url>http://apache.org</url>
<build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <skipTests>true</skipTests>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <skipTests>true</skipTests>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
<dependencies>
<dependency>
http://git-wip-us.apache.org/repos/asf/stratos/blob/7519ffcd/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/CartridgeAgent.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/CartridgeAgent.java b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/CartridgeAgent.java
index 4377050..436028b 100644
--- a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/CartridgeAgent.java
+++ b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/CartridgeAgent.java
@@ -41,10 +41,10 @@ import java.util.List;
*/
public class CartridgeAgent implements Runnable {
- private static final Log log = LogFactory.getLog(CartridgeAgent.class);
+ private static final Log log = LogFactory.getLog(CartridgeAgent.class);
private static final ExtensionHandler extensionHandler = new DefaultExtensionHandler();
private boolean terminated;
-
+
private CartridgeAgentEventListeners eventListenerns;
@Override
@@ -52,9 +52,9 @@ public class CartridgeAgent implements Runnable {
if (log.isInfoEnabled()) {
log.info("Cartridge agent started");
}
-
- eventListenerns = new CartridgeAgentEventListeners();
-
+
+ eventListenerns = new CartridgeAgentEventListeners();
+
validateRequiredSystemProperties();
if (log.isInfoEnabled()) {
log.info("Cartridge agent validated system properties done");
@@ -66,12 +66,12 @@ public class CartridgeAgent implements Runnable {
log.info("Cartridge agent registerTopologyEventListeners done");
}
- if (log.isInfoEnabled()){
+ if (log.isInfoEnabled()) {
log.info("Waiting for CompleteTopologyEvent..");
}
ExtensionUtils.waitForCompleteTopology();
- if (log.isInfoEnabled()){
+ if (log.isInfoEnabled()) {
log.info("CompleteTopologyEvent received.");
}
@@ -95,14 +95,14 @@ public class CartridgeAgent implements Runnable {
if (log.isInfoEnabled()) {
log.info("Cartridge agent registerInstanceNotifierEventListeners done");
}
-
+
// Start tenant event receiver thread
/*
registerTenantEventListeners();
if (log.isInfoEnabled()) {
log.info("Cartridge agent registerTenantEventListeners done");
} */
-
+
// Start application event receiver thread
registerApplicationEventListeners();
if (log.isInfoEnabled()) {
@@ -126,7 +126,7 @@ public class CartridgeAgent implements Runnable {
log.error("Error processing start servers event", e);
}
}
-
+
if (log.isInfoEnabled()) {
log.info("Cartridge agent startServerExtension done");
}
@@ -150,11 +150,11 @@ public class CartridgeAgent implements Runnable {
log.info("Cartridge agent onInstanceActivatedEvent done");
}
} else {
- if (log.isInfoEnabled()) {
+ if (log.isInfoEnabled()) {
log.info("Artifact repository found. Waiting for ArtifactUpdatedEvent to commence cloning.");
}
}
-
+
String persistenceMappingsPayload = CartridgeAgentConfiguration.getInstance().getPersistenceMappings();
if (persistenceMappingsPayload != null) {
extensionHandler.volumeMountExtension(persistenceMappingsPayload);
@@ -163,7 +163,7 @@ public class CartridgeAgent implements Runnable {
// start log publishing
LogPublisherManager logPublisherManager = new LogPublisherManager();
publishLogs(logPublisherManager);
-
+
// Keep the thread live until terminated
while (!terminated) {
try {
@@ -176,62 +176,62 @@ public class CartridgeAgent implements Runnable {
}
protected void registerInstanceNotifierEventListeners() {
- if (log.isDebugEnabled()) {
+ if (log.isDebugEnabled()) {
log.debug("SsubscribeToTopicsAndRegisterListeners before");
}
-
- eventListenerns.startInstanceNotifierReceiver();
-
- if (log.isDebugEnabled()) {
+
+ eventListenerns.startInstanceNotifierReceiver();
+
+ if (log.isDebugEnabled()) {
log.debug("SsubscribeToTopicsAndRegisterListeners after");
}
}
protected void registerTopologyEventListeners() {
- if (log.isDebugEnabled()) {
+ if (log.isDebugEnabled()) {
log.debug("registerTopologyEventListeners before");
}
- eventListenerns.startTopologyEventReceiver();
-
- if (log.isDebugEnabled()) {
+ eventListenerns.startTopologyEventReceiver();
+
+ if (log.isDebugEnabled()) {
log.debug("registerTopologyEventListeners after");
}
}
protected void registerTenantEventListeners() {
- if (log.isDebugEnabled()) {
+ if (log.isDebugEnabled()) {
log.debug("registerTenantEventListeners before");
}
-
- eventListenerns.startTenantEventReceiver();
-
- if (log.isDebugEnabled()) {
+
+ eventListenerns.startTenantEventReceiver();
+
+ if (log.isDebugEnabled()) {
log.debug("registerTenantEventListeners after");
}
}
-
+
protected void registerApplicationEventListeners() {
- if (log.isDebugEnabled()) {
+ if (log.isDebugEnabled()) {
log.debug("registerApplicationListeners before");
}
-
- eventListenerns.startApplicationsEventReceiver();
-
- if (log.isDebugEnabled()) {
+
+ eventListenerns.startApplicationsEventReceiver();
+
+ if (log.isDebugEnabled()) {
log.debug("registerApplicationEventListeners after");
}
}
protected void validateRequiredSystemProperties() {
String jndiPropertiesDir = System.getProperty(CartridgeAgentConstants.JNDI_PROPERTIES_DIR);
-
+
if (StringUtils.isBlank(jndiPropertiesDir)) {
if (log.isErrorEnabled()) {
log.error(String.format("System property not found: %s", CartridgeAgentConstants.JNDI_PROPERTIES_DIR));
}
return;
}
-
+
String payloadPath = System.getProperty(CartridgeAgentConstants.PARAM_FILE_PATH);
if (StringUtils.isBlank(payloadPath)) {
if (log.isErrorEnabled()) {
@@ -239,14 +239,14 @@ public class CartridgeAgent implements Runnable {
}
return;
}
-
+
String extensionsDir = System.getProperty(CartridgeAgentConstants.EXTENSIONS_DIR);
if (StringUtils.isBlank(extensionsDir)) {
if (log.isWarnEnabled()) {
log.warn(String.format("System property not found: %s", CartridgeAgentConstants.EXTENSIONS_DIR));
}
}
-
+
}
private static void publishLogs(LogPublisherManager logPublisherManager) {
http://git-wip-us.apache.org/repos/asf/stratos/blob/7519ffcd/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/CartridgeAgentEventListeners.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/CartridgeAgentEventListeners.java b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/CartridgeAgentEventListeners.java
index b55027b..6192e6b 100644
--- a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/CartridgeAgentEventListeners.java
+++ b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/CartridgeAgentEventListeners.java
@@ -35,8 +35,7 @@ import org.apache.stratos.messaging.message.receiver.topology.TopologyManager;
import java.util.concurrent.ExecutorService;
-public class CartridgeAgentEventListeners
-{
+public class CartridgeAgentEventListeners {
private static final Log log = LogFactory.getLog(CartridgeAgentEventListeners.class);
@@ -44,60 +43,59 @@ public class CartridgeAgentEventListeners
private TopologyEventReceiver topologyEventReceiver;
private TenantEventReceiver tenantEventReceiver;
private ApplicationSignUpEventReceiver applicationsEventReceiver;
-
+
private ExtensionHandler extensionHandler;
private static final ExecutorService eventListenerExecutorService =
StratosThreadPool.getExecutorService("cartridge.agent.event.listener.thread.pool", 10);
public CartridgeAgentEventListeners() {
- if (log.isDebugEnabled()) {
+ if (log.isDebugEnabled()) {
log.debug("Creating cartridge agent event listeners...");
}
this.applicationsEventReceiver = new ApplicationSignUpEventReceiver();
this.applicationsEventReceiver.setExecutorService(eventListenerExecutorService);
-
+
this.topologyEventReceiver = new TopologyEventReceiver();
this.topologyEventReceiver.setExecutorService(eventListenerExecutorService);
-
+
this.instanceNotifierEventReceiver = new InstanceNotifierEventReceiver();
-
+
this.tenantEventReceiver = new TenantEventReceiver();
this.tenantEventReceiver.setExecutorService(eventListenerExecutorService);
extensionHandler = new DefaultExtensionHandler();
-
+
addInstanceNotifierEventListeners();
addTopologyEventListeners();
addTenantEventListeners();
addApplicationsEventListeners();
-
+
if (log.isDebugEnabled()) {
log.debug("Cartridge agent event listeners created");
}
}
public void startTopologyEventReceiver() {
-
- if (log.isDebugEnabled()) {
+
+ if (log.isDebugEnabled()) {
log.debug("Starting cartridge agent topology event message receiver");
}
eventListenerExecutorService.submit(new Runnable() {
@Override
public void run() {
- topologyEventReceiver.execute();
+ topologyEventReceiver.execute();
}
});
- if (log.isInfoEnabled())
- {
+ if (log.isInfoEnabled()) {
log.info("Cartridge agent topology receiver thread started, waiting for event messages ...");
}
}
-
+
public void startInstanceNotifierReceiver() {
-
+
if (log.isDebugEnabled()) {
log.debug("Starting cartridge agent instance notifier event message receiver");
}
@@ -113,17 +111,17 @@ public class CartridgeAgentEventListeners
log.debug("Cartridge agent Instance notifier event message receiver started, waiting for event messages ...");
}
}
-
+
public void startTenantEventReceiver() {
-
- if (log.isDebugEnabled()) {
+
+ if (log.isDebugEnabled()) {
log.debug("Starting cartridge agent tenant event message receiver");
}
eventListenerExecutorService.submit(new Runnable() {
@Override
public void run() {
- topologyEventReceiver.execute();
+ topologyEventReceiver.execute();
}
});
@@ -132,17 +130,17 @@ public class CartridgeAgentEventListeners
}
}
-
+
public void startApplicationsEventReceiver() {
-
- if (log.isDebugEnabled()) {
+
+ if (log.isDebugEnabled()) {
log.debug("Starting cartridge agent application event message receiver");
}
eventListenerExecutorService.submit(new Runnable() {
@Override
public void run() {
- applicationsEventReceiver.execute();
+ applicationsEventReceiver.execute();
}
});
@@ -151,8 +149,8 @@ public class CartridgeAgentEventListeners
}
}
-
-
+
+
private void addInstanceNotifierEventListeners() {
instanceNotifierEventReceiver.addEventListener(new ArtifactUpdateEventListener() {
@Override
@@ -197,15 +195,15 @@ public class CartridgeAgentEventListeners
});
- if(log.isInfoEnabled()) {
+ if (log.isInfoEnabled()) {
log.info("Instance notifier event listener added ... ");
}
}
-
+
private void addTopologyEventListeners() {
- topologyEventReceiver.addEventListener(new MemberInitializedEventListener() {
- @Override
- protected void onEvent(Event event) {
+ topologyEventReceiver.addEventListener(new MemberInitializedEventListener() {
+ @Override
+ protected void onEvent(Event event) {
boolean initialized = CartridgeAgentConfiguration.getInstance().isInitialized();
if (initialized) {
// no need to process this event, if the member is initialized.
@@ -213,24 +211,24 @@ public class CartridgeAgentEventListeners
}
try {
TopologyManager.acquireReadLock();
- if (log.isDebugEnabled()) {
- log.debug("Member initialized event received");
- }
- MemberInitializedEvent memberInitializedEvent = (MemberInitializedEvent) event;
- extensionHandler.onMemberInitializedEvent(memberInitializedEvent);
- } catch (Exception e) {
- if (log.isErrorEnabled()) {
- log.error("Error processing member created event", e);
- }
- } finally {
- TopologyManager.releaseReadLock();
- }
- }
+ if (log.isDebugEnabled()) {
+ log.debug("Member initialized event received");
+ }
+ MemberInitializedEvent memberInitializedEvent = (MemberInitializedEvent) event;
+ extensionHandler.onMemberInitializedEvent(memberInitializedEvent);
+ } catch (Exception e) {
+ if (log.isErrorEnabled()) {
+ log.error("Error processing member created event", e);
+ }
+ } finally {
+ TopologyManager.releaseReadLock();
+ }
+ }
});
-
+
topologyEventReceiver.addEventListener(new MemberCreatedEventListener() {
- @Override
- protected void onEvent(Event event) {
+ @Override
+ protected void onEvent(Event event) {
boolean initialized = CartridgeAgentConfiguration.getInstance().isInitialized();
if (initialized) {
// no need to process this event, if the member is initialized.
@@ -238,28 +236,28 @@ public class CartridgeAgentEventListeners
}
try {
TopologyManager.acquireReadLock();
- if (log.isDebugEnabled()) {
- log.debug("Member created event received");
- }
- MemberCreatedEvent memberCreatedEvent = (MemberCreatedEvent) event;
- extensionHandler.onMemberCreatedEvent(memberCreatedEvent);
- } catch (Exception e) {
- if (log.isErrorEnabled()) {
- log.error("Error processing member created event", e);
- }
- } finally {
- TopologyManager.releaseReadLock();
- }
- }
+ if (log.isDebugEnabled()) {
+ log.debug("Member created event received");
+ }
+ MemberCreatedEvent memberCreatedEvent = (MemberCreatedEvent) event;
+ extensionHandler.onMemberCreatedEvent(memberCreatedEvent);
+ } catch (Exception e) {
+ if (log.isErrorEnabled()) {
+ log.error("Error processing member created event", e);
+ }
+ } finally {
+ TopologyManager.releaseReadLock();
+ }
+ }
});
topologyEventReceiver.addEventListener(new MemberActivatedEventListener() {
@Override
protected void onEvent(Event event) {
- boolean initialized = CartridgeAgentConfiguration.getInstance().isInitialized();
- if (!initialized) {
- return;
- }
+ boolean initialized = CartridgeAgentConfiguration.getInstance().isInitialized();
+ if (!initialized) {
+ return;
+ }
try {
TopologyManager.acquireReadLock();
if (log.isDebugEnabled()) {
@@ -280,10 +278,10 @@ public class CartridgeAgentEventListeners
topologyEventReceiver.addEventListener(new MemberTerminatedEventListener() {
@Override
protected void onEvent(Event event) {
- boolean initialized = CartridgeAgentConfiguration.getInstance().isInitialized();
- if (!initialized) {
- return;
- }
+ boolean initialized = CartridgeAgentConfiguration.getInstance().isInitialized();
+ if (!initialized) {
+ return;
+ }
try {
TopologyManager.acquireReadLock();
if (log.isDebugEnabled()) {
@@ -304,10 +302,10 @@ public class CartridgeAgentEventListeners
topologyEventReceiver.addEventListener(new MemberSuspendedEventListener() {
@Override
protected void onEvent(Event event) {
- boolean initialized = CartridgeAgentConfiguration.getInstance().isInitialized();
- if (!initialized) {
- return;
- }
+ boolean initialized = CartridgeAgentConfiguration.getInstance().isInitialized();
+ if (!initialized) {
+ return;
+ }
try {
TopologyManager.acquireReadLock();
if (log.isDebugEnabled()) {
@@ -328,7 +326,7 @@ public class CartridgeAgentEventListeners
topologyEventReceiver.addEventListener(new CompleteTopologyEventListener() {
@Override
protected void onEvent(Event event) {
- boolean initialized = CartridgeAgentConfiguration.getInstance().isInitialized();
+ boolean initialized = CartridgeAgentConfiguration.getInstance().isInitialized();
if (!initialized) {
try {
TopologyManager.acquireReadLock();
@@ -351,10 +349,10 @@ public class CartridgeAgentEventListeners
topologyEventReceiver.addEventListener(new MemberStartedEventListener() {
@Override
protected void onEvent(Event event) {
- boolean initialized = CartridgeAgentConfiguration.getInstance().isInitialized();
- if (!initialized) {
- return;
- }
+ boolean initialized = CartridgeAgentConfiguration.getInstance().isInitialized();
+ if (!initialized) {
+ return;
+ }
try {
TopologyManager.acquireReadLock();
if (log.isDebugEnabled()) {
@@ -371,16 +369,17 @@ public class CartridgeAgentEventListeners
}
}
});
-
- if(log.isInfoEnabled()) {
+
+ if (log.isInfoEnabled()) {
log.info("Topology event listener added ... ");
}
}
-
+
private void addTenantEventListeners() {
-
+
tenantEventReceiver.addEventListener(new CompleteTenantEventListener() {
private boolean initialized;
+
@Override
protected void onEvent(Event event) {
if (!initialized) {
@@ -451,7 +450,7 @@ public class CartridgeAgentEventListeners
}
}
});
-
+
tenantEventReceiver.addEventListener(new TenantCreatedEventListener() {
@Override
protected void onEvent(Event event) {
@@ -474,17 +473,17 @@ public class CartridgeAgentEventListeners
}
});
- if(log.isInfoEnabled()) {
+ if (log.isInfoEnabled()) {
log.info("Tenant event listener added ... ");
}
- }
-
+ }
+
private void addApplicationsEventListeners() {
applicationsEventReceiver.addEventListener(new ApplicationSignUpRemovedEventListener() {
@Override
protected void onEvent(Event event) {
try {
- ApplicationSignUpRemovedEvent applicationSignUpRemovedEvent = (ApplicationSignUpRemovedEvent) event;
+ ApplicationSignUpRemovedEvent applicationSignUpRemovedEvent = (ApplicationSignUpRemovedEvent) event;
extensionHandler.onApplicationSignUpRemovedEvent(applicationSignUpRemovedEvent);
} catch (Exception e) {
if (log.isErrorEnabled()) {
@@ -494,7 +493,7 @@ public class CartridgeAgentEventListeners
}
});
- if(log.isInfoEnabled()) {
+ if (log.isInfoEnabled()) {
log.info("applications event listener added ... ");
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/7519ffcd/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/Main.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/Main.java b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/Main.java
index 1427fd0..4bb1b89 100644
--- a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/Main.java
+++ b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/Main.java
@@ -53,7 +53,7 @@ public class Main {
});
// Configure log4j properties
- if(log.isDebugEnabled()) {
+ if (log.isDebugEnabled()) {
log.debug("Configuring log4j.properties file path");
}
PropertyConfigurator.configure(System.getProperty("log4j.configuration"));
http://git-wip-us.apache.org/repos/asf/stratos/blob/7519ffcd/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/artifact/deployment/synchronizer/RepositoryInformation.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/artifact/deployment/synchronizer/RepositoryInformation.java b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/artifact/deployment/synchronizer/RepositoryInformation.java
index 443d94e..c802e0c 100644
--- a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/artifact/deployment/synchronizer/RepositoryInformation.java
+++ b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/artifact/deployment/synchronizer/RepositoryInformation.java
@@ -21,50 +21,61 @@ package org.apache.stratos.cartridge.agent.artifact.deployment.synchronizer;
public class RepositoryInformation {
- private String repoUrl;
- private String repoUsername;
- private String repoPassword;
- private String repoPath;
- private String tenantId;
- private boolean isMultitenant;
+ private String repoUrl;
+ private String repoUsername;
+ private String repoPassword;
+ private String repoPath;
+ private String tenantId;
+ private boolean isMultitenant;
private boolean commitEnabled;
-
- public String getRepoUrl() {
- return repoUrl;
- }
- public void setRepoUrl(String repoUrl) {
- this.repoUrl = repoUrl;
- }
- public String getRepoUsername() {
- return repoUsername;
- }
- public void setRepoUsername(String repoUsername) {
- this.repoUsername = repoUsername;
- }
- public String getRepoPassword() {
- return repoPassword;
- }
- public void setRepoPassword(String repoPassword) {
- this.repoPassword = repoPassword;
- }
- public String getRepoPath() {
- return repoPath;
- }
- public void setRepoPath(String repoPath) {
- this.repoPath = repoPath;
- }
- public String getTenantId() {
- return tenantId;
- }
- public void setTenantId(String tenantId) {
- this.tenantId = tenantId;
- }
- public boolean isMultitenant() {
- return isMultitenant;
- }
- public void setMultitenant(boolean isMultitenant) {
- this.isMultitenant = isMultitenant;
- }
+
+ public String getRepoUrl() {
+ return repoUrl;
+ }
+
+ public void setRepoUrl(String repoUrl) {
+ this.repoUrl = repoUrl;
+ }
+
+ public String getRepoUsername() {
+ return repoUsername;
+ }
+
+ public void setRepoUsername(String repoUsername) {
+ this.repoUsername = repoUsername;
+ }
+
+ public String getRepoPassword() {
+ return repoPassword;
+ }
+
+ public void setRepoPassword(String repoPassword) {
+ this.repoPassword = repoPassword;
+ }
+
+ public String getRepoPath() {
+ return repoPath;
+ }
+
+ public void setRepoPath(String repoPath) {
+ this.repoPath = repoPath;
+ }
+
+ public String getTenantId() {
+ return tenantId;
+ }
+
+ public void setTenantId(String tenantId) {
+ this.tenantId = tenantId;
+ }
+
+ public boolean isMultitenant() {
+ return isMultitenant;
+ }
+
+ public void setMultitenant(boolean isMultitenant) {
+ this.isMultitenant = isMultitenant;
+ }
public boolean isCommitEnabled() {
return commitEnabled;
http://git-wip-us.apache.org/repos/asf/stratos/blob/7519ffcd/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/artifact/deployment/synchronizer/git/impl/GitBasedArtifactRepository.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/artifact/deployment/synchronizer/git/impl/GitBasedArtifactRepository.java b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/artifact/deployment/synchronizer/git/impl/GitBasedArtifactRepository.java
index fec47a6..9fe3818 100644
--- a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/artifact/deployment/synchronizer/git/impl/GitBasedArtifactRepository.java
+++ b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/artifact/deployment/synchronizer/git/impl/GitBasedArtifactRepository.java
@@ -235,8 +235,9 @@ public class GitBasedArtifactRepository {
log.info("caching repo context");
- tenantToRepoContextMap.put(tenantId, gitRepoCtx);
-}
+ tenantToRepoContextMap.put(tenantId, gitRepoCtx);
+ }
+
/**
* Retrieve cached RepositoryContext relevant to the tenant's local repo path
*
@@ -261,39 +262,39 @@ public class GitBasedArtifactRepository {
public void commit(RepositoryInformation repoInfo) {
// TODO implement later, this is applicable for management node.
- // for (Entry<Integer, RepositoryContext> tenantMap : tenantToRepoContextMap
- // .entrySet()) {
+ // for (Entry<Integer, RepositoryContext> tenantMap : tenantToRepoContextMap
+ // .entrySet()) {
- int tenantId = Integer.parseInt(repoInfo.getTenantId());
- //log.info("map count has values..tenant Id : " + tenantId);
+ int tenantId = Integer.parseInt(repoInfo.getTenantId());
+ //log.info("map count has values..tenant Id : " + tenantId);
- RepositoryContext gitRepoCtx = retrieveCachedGitContext(tenantId);
- Git git = gitRepoCtx.getGit();
- StatusCommand statusCmd = git.status();
- Status status = null;
- try {
- status = statusCmd.call();
+ RepositoryContext gitRepoCtx = retrieveCachedGitContext(tenantId);
+ Git git = gitRepoCtx.getGit();
+ StatusCommand statusCmd = git.status();
+ Status status = null;
+ try {
+ status = statusCmd.call();
- } catch (GitAPIException e) {
- log.error(
- "Git status operation for tenant "
- + gitRepoCtx.getTenantId() + " failed, ", e);
+ } catch (GitAPIException e) {
+ log.error(
+ "Git status operation for tenant "
+ + gitRepoCtx.getTenantId() + " failed, ", e);
+ }
+ //log.info("status : " + status.toString());
+ if (status.isClean()) {// no changes, nothing to commit
+ if (log.isDebugEnabled()) {
+ log.debug("No changes detected in the local repository for tenant " + tenantId);
}
- //log.info("status : " + status.toString());
- if (status.isClean()) {// no changes, nothing to commit
- if (log.isDebugEnabled()) {
- log.debug("No changes detected in the local repository for tenant " + tenantId);
- }
- return;
- }
+ return;
+ }
- addArtifacts(gitRepoCtx, getNewArtifacts(status));
- addArtifacts(gitRepoCtx, getModifiedArtifacts(status));
- removeArtifacts(gitRepoCtx, getRemovedArtifacts(status));
- commitToLocalRepo(gitRepoCtx);
- pushToRemoteRepo(gitRepoCtx);
+ addArtifacts(gitRepoCtx, getNewArtifacts(status));
+ addArtifacts(gitRepoCtx, getModifiedArtifacts(status));
+ removeArtifacts(gitRepoCtx, getRemovedArtifacts(status));
+ commitToLocalRepo(gitRepoCtx);
+ pushToRemoteRepo(gitRepoCtx);
//}
//return false;
@@ -439,47 +440,46 @@ public class GitBasedArtifactRepository {
}
- public boolean checkout (RepositoryInformation repositoryInformation) throws Exception {
+ public boolean checkout(RepositoryInformation repositoryInformation) throws Exception {
- int tenantId = Integer.parseInt(repositoryInformation.getTenantId());
+ int tenantId = Integer.parseInt(repositoryInformation.getTenantId());
- // if context for tenant is not initialized
- if (tenantToRepoContextMap.get(tenantId) == null) {
- initGitContext(repositoryInformation);
- }
+ // if context for tenant is not initialized
+ if (tenantToRepoContextMap.get(tenantId) == null) {
+ initGitContext(repositoryInformation);
+ }
- RepositoryContext gitRepoCtx = retrieveCachedGitContext(tenantId);
+ RepositoryContext gitRepoCtx = retrieveCachedGitContext(tenantId);
- File gitRepoDir = new File(gitRepoCtx.getGitLocalRepoPath());
- if (!gitRepoDir.exists()) {
- return cloneRepository(gitRepoCtx);
- }
- else {
- if (isValidGitRepo(gitRepoCtx)) {
- if (log.isDebugEnabled()) {
- log.debug("Existing git repository detected for tenant " + gitRepoCtx.getTenantId() + ", no clone required");
- }
+ File gitRepoDir = new File(gitRepoCtx.getGitLocalRepoPath());
+ if (!gitRepoDir.exists()) {
+ return cloneRepository(gitRepoCtx);
+ } else {
+ if (isValidGitRepo(gitRepoCtx)) {
+ if (log.isDebugEnabled()) {
+ log.debug("Existing git repository detected for tenant " + gitRepoCtx.getTenantId() + ", no clone required");
+ }
- return pullAndHandleErrors(gitRepoCtx);
+ return pullAndHandleErrors(gitRepoCtx);
- } else {
- // not a valid git repo, check if the directory is non-empty
- if (gitRepoDir.list().length > 0) {
- // directory is non empty. sync existing artifacts with the remote repository
- if (syncInitialLocalArtifacts(gitRepoCtx)) {
- log.info("Existing local artifacts for tenant [" + gitRepoCtx.getTenantId() + "] synchronized with remote repository successfully");
- // pull any changes from the remote repo
- return pullAndHandleErrors(gitRepoCtx);
- }
- return false;
+ } else {
+ // not a valid git repo, check if the directory is non-empty
+ if (gitRepoDir.list().length > 0) {
+ // directory is non empty. sync existing artifacts with the remote repository
+ if (syncInitialLocalArtifacts(gitRepoCtx)) {
+ log.info("Existing local artifacts for tenant [" + gitRepoCtx.getTenantId() + "] synchronized with remote repository successfully");
+ // pull any changes from the remote repo
+ return pullAndHandleErrors(gitRepoCtx);
+ }
+ return false;
- } else {
- // directory is empty, clone
- return cloneRepository(gitRepoCtx);
- }
- }
- }
- }
+ } else {
+ // directory is empty, clone
+ return cloneRepository(gitRepoCtx);
+ }
+ }
+ }
+ }
public boolean removeRepo(int tenantId) throws IOException {
RepositoryContext gitRepoCtx = retrieveCachedGitContext(tenantId);
@@ -499,7 +499,7 @@ public class GitBasedArtifactRepository {
ExtensionUtils.executeCopyArtifactsExtension(
CartridgeAgentConstants.SUPERTENANT_TEMP_PATH,
CartridgeAgentConfiguration.getInstance().getAppPath() + "/repository/deployment/server/"
- );
+ );
}
}
@@ -507,7 +507,7 @@ public class GitBasedArtifactRepository {
return true;
}
- private boolean pullAndHandleErrors (RepositoryContext gitRepoCtx) {
+ private boolean pullAndHandleErrors(RepositoryContext gitRepoCtx) {
try {
return pullArtifacts(gitRepoCtx);
@@ -532,9 +532,9 @@ public class GitBasedArtifactRepository {
boolean checkoutSuccess = false;
CheckoutCommand checkoutCmd = gitRepoCtx.getGit().checkout();
- for(String path : paths) {
+ for (String path : paths) {
checkoutCmd.addPath(path);
- if(log.isDebugEnabled()) {
+ if (log.isDebugEnabled()) {
log.debug("Added the file path " + path + " to checkout from the remote repository");
}
}
@@ -553,7 +553,7 @@ public class GitBasedArtifactRepository {
return checkoutSuccess;
}
- private void resetToRemoteHead (RepositoryContext gitRepoCtx, List<String> paths) {
+ private void resetToRemoteHead(RepositoryContext gitRepoCtx, List<String> paths) {
ResetCommand resetCmd = gitRepoCtx.getGit().reset();
@@ -562,9 +562,9 @@ public class GitBasedArtifactRepository {
setRef(GitDeploymentSynchronizerConstants.ORIGIN + "/" + GitDeploymentSynchronizerConstants.MASTER);
// add paths
- for(String path : paths) {
+ for (String path : paths) {
resetCmd.addPath(path);
- if(log.isDebugEnabled()) {
+ if (log.isDebugEnabled()) {
log.debug("Added the file path " + path + " to reset");
}
}
@@ -706,15 +706,14 @@ public class GitBasedArtifactRepository {
}
return true;
}*/
-
- private boolean pullArtifacts (RepositoryContext gitRepoCtx) throws CheckoutConflictException {
+ private boolean pullArtifacts(RepositoryContext gitRepoCtx) throws CheckoutConflictException {
PullCommand pullCmd = gitRepoCtx.getGit().pull();
UsernamePasswordCredentialsProvider credentialsProvider = createCredentialsProvider(gitRepoCtx);
if (credentialsProvider == null) {
- log.warn ("Remote repository credentials not available for tenant " + gitRepoCtx.getTenantId() +
+ log.warn("Remote repository credentials not available for tenant " + gitRepoCtx.getTenantId() +
", aborting pull");
return false;
}
@@ -845,14 +844,13 @@ public class GitBasedArtifactRepository {
log.error("Git clone operation for tenant " + gitRepoCtx.getTenantId() + " failed", e);
}
}*/
-
- private boolean cloneRepository (RepositoryContext gitRepoCtx) { //should happen only at the beginning
+ private boolean cloneRepository(RepositoryContext gitRepoCtx) { //should happen only at the beginning
boolean cloneSuccess = false;
File gitRepoDir = new File(gitRepoCtx.getGitLocalRepoPath());
- CloneCommand cloneCmd = Git.cloneRepository().
+ CloneCommand cloneCmd = Git.cloneRepository().
setURI(gitRepoCtx.getGitRemoteRepoUrl()).
setDirectory(gitRepoDir).
setBranch(GitDeploymentSynchronizerConstants.GIT_REFS_HEADS_MASTER);
@@ -860,7 +858,7 @@ public class GitBasedArtifactRepository {
UsernamePasswordCredentialsProvider credentialsProvider = createCredentialsProvider(gitRepoCtx);
if (credentialsProvider == null) {
- log.warn ("Remote repository credentials not available for tenant " + gitRepoCtx.getTenantId() +
+ log.warn("Remote repository credentials not available for tenant " + gitRepoCtx.getTenantId() +
", aborting clone");
return false;
}
@@ -903,7 +901,7 @@ public class GitBasedArtifactRepository {
private static boolean isValidGitRepo(RepositoryContext gitRepoCtx) {
// check if has been marked as cloned before
- if(gitRepoCtx.cloneExists()) {
+ if (gitRepoCtx.cloneExists()) {
// repo is valid
return true;
}
@@ -917,7 +915,7 @@ public class GitBasedArtifactRepository {
return false;
}
- public static void InitGitRepository (File gitRepoDir) throws Exception {
+ public static void InitGitRepository(File gitRepoDir) throws Exception {
try {
Git.init().setDirectory(gitRepoDir).setBare(false).call();
@@ -929,7 +927,7 @@ public class GitBasedArtifactRepository {
}
}
- public static boolean addRemote (Repository repository, String remoteUrl) {
+ public static boolean addRemote(Repository repository, String remoteUrl) {
boolean remoteAdded = false;
http://git-wip-us.apache.org/repos/asf/stratos/blob/7519ffcd/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/artifact/deployment/synchronizer/git/internal/CustomJschConfigSessionFactory.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/artifact/deployment/synchronizer/git/internal/CustomJschConfigSessionFactory.java b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/artifact/deployment/synchronizer/git/internal/CustomJschConfigSessionFactory.java
index 2594071..4c80505 100644
--- a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/artifact/deployment/synchronizer/git/internal/CustomJschConfigSessionFactory.java
+++ b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/artifact/deployment/synchronizer/git/internal/CustomJschConfigSessionFactory.java
@@ -48,13 +48,13 @@ public class CustomJschConfigSessionFactory extends JschConfigSessionFactory {
String keyPath = ServerConfiguration.getInstance().
getFirstProperty(GitDeploymentSynchronizerConstants.SSH_PRIVATE_KEY_PATH);
- if(keyName == null || keyName.isEmpty())
+ if (keyName == null || keyName.isEmpty())
keyName = GitDeploymentSynchronizerConstants.SSH_KEY;
- if(keyPath == null || keyPath.isEmpty())
+ if (keyPath == null || keyPath.isEmpty())
keyPath = System.getProperty("user.home") + "/" + GitDeploymentSynchronizerConstants.SSH_KEY_DIRECTORY;
- if(keyPath.endsWith("/"))
+ if (keyPath.endsWith("/"))
def.addIdentity(keyPath + keyName);
else
def.addIdentity(keyPath + "/" + keyName);
http://git-wip-us.apache.org/repos/asf/stratos/blob/7519ffcd/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/artifact/deployment/synchronizer/git/internal/RepositoryContext.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/artifact/deployment/synchronizer/git/internal/RepositoryContext.java b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/artifact/deployment/synchronizer/git/internal/RepositoryContext.java
index f91a3f3..352a85f 100644
--- a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/artifact/deployment/synchronizer/git/internal/RepositoryContext.java
+++ b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/artifact/deployment/synchronizer/git/internal/RepositoryContext.java
@@ -46,7 +46,7 @@ public class RepositoryContext {
private String repoPassword;
private ScheduledExecutorService artifactSyncSchedular;
- public RepositoryContext () {
+ public RepositoryContext() {
}
@@ -114,21 +114,21 @@ public class RepositoryContext {
this.keyBasedAuthentication = keyBasedAuthentication;
}
- public String getRepoUsername() {
- return repoUsername;
- }
+ public String getRepoUsername() {
+ return repoUsername;
+ }
- public void setRepoUsername(String repoUsername) {
- this.repoUsername = repoUsername;
- }
+ public void setRepoUsername(String repoUsername) {
+ this.repoUsername = repoUsername;
+ }
- public String getRepoPassword() {
- return repoPassword;
- }
+ public String getRepoPassword() {
+ return repoPassword;
+ }
- public void setRepoPassword(String repoPassword) {
- this.repoPassword = repoPassword;
- }
+ public void setRepoPassword(String repoPassword) {
+ this.repoPassword = repoPassword;
+ }
public ScheduledExecutorService getArtifactSyncSchedular() {
return artifactSyncSchedular;
http://git-wip-us.apache.org/repos/asf/stratos/blob/7519ffcd/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/artifact/deployment/synchronizer/git/util/Utilities.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/artifact/deployment/synchronizer/git/util/Utilities.java b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/artifact/deployment/synchronizer/git/util/Utilities.java
index fd50b5b..832d41f 100644
--- a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/artifact/deployment/synchronizer/git/util/Utilities.java
+++ b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/artifact/deployment/synchronizer/git/util/Utilities.java
@@ -41,15 +41,14 @@ public class Utilities {
* @param input input String
* @param regex regex to match
* @param group grouping,
- *
* @return result of the match if found, else empty String
*/
- public static String getMatch (String input, String regex, int group) {
+ public static String getMatch(String input, String regex, int group) {
- String whitespaceRemovedJsonString = input.replaceAll("\\s+","");
+ String whitespaceRemovedJsonString = input.replaceAll("\\s+", "");
Pattern pattern = Pattern.compile(regex);
Matcher matcher = pattern.matcher(whitespaceRemovedJsonString);
- if(!matcher.find())
+ if (!matcher.find())
return "";
else
return matcher.group(group).trim();
@@ -60,12 +59,12 @@ public class Utilities {
*
* @param existingDir folder to delete
*/
- public static void deleteFolderStructure (File existingDir) {
+ public static void deleteFolderStructure(File existingDir) {
try {
FileUtils.deleteDirectory(existingDir);
- if(log.isDebugEnabled()) {
- log.debug(" Directory [" + existingDir + "] deleted. ");
+ if (log.isDebugEnabled()) {
+ log.debug(" Directory [" + existingDir + "] deleted. ");
}
} catch (IOException e) {
http://git-wip-us.apache.org/repos/asf/stratos/blob/7519ffcd/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/config/CartridgeAgentConfiguration.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/config/CartridgeAgentConfiguration.java b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/config/CartridgeAgentConfiguration.java
index b89ae28..3c2e201 100644
--- a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/config/CartridgeAgentConfiguration.java
+++ b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/config/CartridgeAgentConfiguration.java
@@ -81,11 +81,11 @@ public class CartridgeAgentConfiguration {
parameters = loadParametersFile();
try {
- //self.application_id = self.read_property(cartridgeagentconstants.APPLICATION_ID)
- applicationId = readApplicationId();
+ //self.application_id = self.read_property(cartridgeagentconstants.APPLICATION_ID)
+ applicationId = readApplicationId();
serviceGroup = readServiceGroup();
isClustered = readClustering();
- //self.service_name = self.read_property(cartridgeagentconstants.SERVICE_NAME)
+ //self.service_name = self.read_property(cartridgeagentconstants.SERVICE_NAME)
serviceName = readParameterValue(CartridgeAgentConstants.SERVICE_NAME);
//self.cluster_id = self.read_property(cartridgeagentconstants.CLUSTER_ID)
clusterId = readParameterValue(CartridgeAgentConstants.CLUSTER_ID);
@@ -117,7 +117,7 @@ public class CartridgeAgentConfiguration {
// not mandatory
lbPrivateIp = System.getProperty(CartridgeAgentConstants.LB_PRIVATE_IP);
lbPublicIp = System.getProperty(CartridgeAgentConstants.LB_PUBLIC_IP);
- tenantRepositoryPath = System.getProperty(CartridgeAgentConstants.TENANT_REPO_PATH);
+ tenantRepositoryPath = System.getProperty(CartridgeAgentConstants.TENANT_REPO_PATH);
superTenantRepositoryPath = System.getProperty(CartridgeAgentConstants.SUPER_TENANT_REPO_PATH);
deployment = readDeployment();
@@ -125,14 +125,13 @@ public class CartridgeAgentConfiguration {
workerServiceName = readWorkerServiceType();
isPrimary = readIsPrimary();
kubernetesClusterId = readKubernetesClusterIdValue(CartridgeAgentConstants.KUBERNETES_CLUSTER_ID);
-
+
//self.cluster_instance_id= self.read_property(cartridgeagentconstants.CLUSTER_INSTANCE_ID)
clusterInstanceId = readClusterInstanceId();
//self.dependant_cluster_id = self.read_property(cartridgeagentconstants.DEPENDENCY_CLUSTER_IDS, False)
dependantClusterId = readDependantClusterId();
-
-
-
+
+
} catch (ParameterNotFoundException e) {
throw new RuntimeException(e);
}
@@ -142,8 +141,8 @@ public class CartridgeAgentConfiguration {
}
if (log.isDebugEnabled()) {
- log.debug(String.format("application-id: %s", applicationId));
- log.debug(String.format("service-group: %s", serviceGroup));
+ log.debug(String.format("application-id: %s", applicationId));
+ log.debug(String.format("service-group: %s", serviceGroup));
log.debug(String.format("cluster-id: %s", clusterId));
log.debug(String.format("service-name: %s", serviceName));
log.debug(String.format("cluster-id: %s", clusterId));
@@ -162,80 +161,80 @@ public class CartridgeAgentConfiguration {
}
private String readKubernetesClusterIdValue(String kubernetesClusterId) {
- String kubernetesClusterIdValue = null;
- if (parameters.containsKey(kubernetesClusterId)) {
- kubernetesClusterIdValue = parameters.get(kubernetesClusterId);
- }
-
- if (System.getProperty(kubernetesClusterId) != null) {
- kubernetesClusterIdValue = System.getProperty(kubernetesClusterId);
- }
- return kubernetesClusterIdValue;
- }
-
- private String readMemberIdValue(String memberId) {
- String memberIdValue = null;
- if (parameters.containsKey(memberId) && parameters.get(memberId) != null) {
- memberIdValue = parameters.get(memberId);
- } else if (System.getProperty(memberId) != null) {
- memberIdValue = System.getProperty(memberId);
- } else {
- String hostname = "unknown";
- try {
- log.info("Reading hostname from container");
- InetAddress addr;
- addr = InetAddress.getLocalHost();
- hostname = addr.getHostName();
- } catch (UnknownHostException e) {
- String msg = "Hostname can not be resolved";
- log.error(msg, e);
- }
- memberIdValue = hostname;
- if (log.isDebugEnabled()) {
- log.debug("MemberId is taking the value of hostname : [" + memberIdValue + "] ");
- }
- }
- return memberIdValue;
- }
-
- private String readDeployment(){
+ String kubernetesClusterIdValue = null;
+ if (parameters.containsKey(kubernetesClusterId)) {
+ kubernetesClusterIdValue = parameters.get(kubernetesClusterId);
+ }
+
+ if (System.getProperty(kubernetesClusterId) != null) {
+ kubernetesClusterIdValue = System.getProperty(kubernetesClusterId);
+ }
+ return kubernetesClusterIdValue;
+ }
+
+ private String readMemberIdValue(String memberId) {
+ String memberIdValue = null;
+ if (parameters.containsKey(memberId) && parameters.get(memberId) != null) {
+ memberIdValue = parameters.get(memberId);
+ } else if (System.getProperty(memberId) != null) {
+ memberIdValue = System.getProperty(memberId);
+ } else {
+ String hostname = "unknown";
+ try {
+ log.info("Reading hostname from container");
+ InetAddress addr;
+ addr = InetAddress.getLocalHost();
+ hostname = addr.getHostName();
+ } catch (UnknownHostException e) {
+ String msg = "Hostname can not be resolved";
+ log.error(msg, e);
+ }
+ memberIdValue = hostname;
+ if (log.isDebugEnabled()) {
+ log.debug("MemberId is taking the value of hostname : [" + memberIdValue + "] ");
+ }
+ }
+ return memberIdValue;
+ }
+
+ private String readDeployment() {
if (parameters.containsKey(CartridgeAgentConstants.DEPLOYMENT)) {
return parameters.get(CartridgeAgentConstants.DEPLOYMENT);
}
return null;
}
- private String readLBClusterIdValue(String lbClusterId) {
- String lbClusterIdValue = null;
- if (parameters.containsKey(lbClusterId)) {
- lbClusterIdValue = parameters.get(lbClusterId);
- }
-
- if (System.getProperty(lbClusterId) != null) {
- lbClusterIdValue = System.getProperty(lbClusterId);
- }
- return lbClusterIdValue;
- }
-
- private String readMinCountValue(String minCountParam) throws ParameterNotFoundException {
-
- String minCountValue = null;
- if (parameters.containsKey(minCountParam)) {
- minCountValue = parameters.get(minCountParam);
- }
- if (System.getProperty(minCountParam) != null) {
- minCountValue = System.getProperty(minCountParam);
- }
-
- if (Boolean.parseBoolean(isClustered)) {
- String message = "Cannot find the value of required parameter: " + minCountParam;
- throw new ParameterNotFoundException(message);
- }
- return minCountValue;
- }
-
-
- private String readManagerServiceType(){
+ private String readLBClusterIdValue(String lbClusterId) {
+ String lbClusterIdValue = null;
+ if (parameters.containsKey(lbClusterId)) {
+ lbClusterIdValue = parameters.get(lbClusterId);
+ }
+
+ if (System.getProperty(lbClusterId) != null) {
+ lbClusterIdValue = System.getProperty(lbClusterId);
+ }
+ return lbClusterIdValue;
+ }
+
+ private String readMinCountValue(String minCountParam) throws ParameterNotFoundException {
+
+ String minCountValue = null;
+ if (parameters.containsKey(minCountParam)) {
+ minCountValue = parameters.get(minCountParam);
+ }
+ if (System.getProperty(minCountParam) != null) {
+ minCountValue = System.getProperty(minCountParam);
+ }
+
+ if (Boolean.parseBoolean(isClustered)) {
+ String message = "Cannot find the value of required parameter: " + minCountParam;
+ throw new ParameterNotFoundException(message);
+ }
+ return minCountValue;
+ }
+
+
+ private String readManagerServiceType() {
if (deployment == null) {
return null;
@@ -260,7 +259,7 @@ public class CartridgeAgentConfiguration {
return null;
}
- private String readWorkerServiceType(){
+ private String readWorkerServiceType() {
if (deployment == null) {
return null;
@@ -285,7 +284,7 @@ public class CartridgeAgentConfiguration {
return null;
}
- private String readIsPrimary(){
+ private String readIsPrimary() {
if (parameters.containsKey(CartridgeAgentConstants.CLUSTERING_PRIMARY_KEY)) {
return parameters.get(CartridgeAgentConstants.CLUSTERING_PRIMARY_KEY);
}
@@ -334,9 +333,9 @@ public class CartridgeAgentConfiguration {
log.info(" INTERNAL payload parameter is not found");
}
- if(internalRepoStringValue != null && internalRepoStringValue.equals(CartridgeAgentConstants.INTERNAL)) {
+ if (internalRepoStringValue != null && internalRepoStringValue.equals(CartridgeAgentConstants.INTERNAL)) {
return true;
- } else{
+ } else {
return false;
}
}
@@ -388,7 +387,7 @@ public class CartridgeAgentConfiguration {
return parameters;
}
-
+
private String readApplicationId() {
if (parameters.containsKey(CartridgeAgentConstants.APPLICATION_ID)) {
return parameters.get(CartridgeAgentConstants.APPLICATION_ID);
@@ -396,7 +395,7 @@ public class CartridgeAgentConfiguration {
return null;
}
}
-
+
private String readServiceGroup() {
if (parameters.containsKey(CartridgeAgentConstants.SERVICE_GROUP)) {
return parameters.get(CartridgeAgentConstants.SERVICE_GROUP);
@@ -404,17 +403,17 @@ public class CartridgeAgentConfiguration {
return null;
}
}
-
+
private String readClusterInstanceId() {
- if (parameters.containsKey(CartridgeAgentConstants.CLUSTER_INSTANCE_ID)) {
+ if (parameters.containsKey(CartridgeAgentConstants.CLUSTER_INSTANCE_ID)) {
return parameters.get(CartridgeAgentConstants.CLUSTER_INSTANCE_ID);
} else {
return null;
}
}
-
+
private String readDependantClusterId() {
- if (parameters.containsKey(CartridgeAgentConstants.DEPENDENCY_CLUSTER_IDS)) {
+ if (parameters.containsKey(CartridgeAgentConstants.DEPENDENCY_CLUSTER_IDS)) {
return parameters.get(CartridgeAgentConstants.DEPENDENCY_CLUSTER_IDS);
} else {
return null;
@@ -570,21 +569,21 @@ public class CartridgeAgentConfiguration {
return isPrimary;
}
- public String getLbPublicIp() {
- return lbPublicIp;
- }
+ public String getLbPublicIp() {
+ return lbPublicIp;
+ }
- public void setLbPublicIp(String lbPublicIp) {
- this.lbPublicIp = lbPublicIp;
- }
+ public void setLbPublicIp(String lbPublicIp) {
+ this.lbPublicIp = lbPublicIp;
+ }
- public String getLbPrivateIp() {
- return lbPrivateIp;
- }
+ public String getLbPrivateIp() {
+ return lbPrivateIp;
+ }
- public void setLbPrivateIp(String lbPrivateIp) {
- this.lbPrivateIp = lbPrivateIp;
- }
+ public void setLbPrivateIp(String lbPrivateIp) {
+ this.lbPrivateIp = lbPrivateIp;
+ }
public String getDeployment() {
return deployment;
@@ -621,18 +620,18 @@ public class CartridgeAgentConfiguration {
public boolean isCheckoutEnabled() {
return isCheckoutEnabled;
}
-
+
public boolean isInitialized() {
- return initialized;
+ return initialized;
}
-
+
public void setInitialized(boolean initialized) {
- this.initialized = initialized;
+ this.initialized = initialized;
}
- public String getKubernetesClusterId() {
- return kubernetesClusterId;
- }
+ public String getKubernetesClusterId() {
+ return kubernetesClusterId;
+ }
public String getInstanceId() {
http://git-wip-us.apache.org/repos/asf/stratos/blob/7519ffcd/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/data/publisher/DataContext.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/data/publisher/DataContext.java b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/data/publisher/DataContext.java
index 1cc02c8..5fc1c81 100644
--- a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/data/publisher/DataContext.java
+++ b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/data/publisher/DataContext.java
@@ -23,9 +23,9 @@ import java.util.Arrays;
public class DataContext {
- private Object [] metaData;
- private Object [] correlationData;
- private Object [] payloadData;
+ private Object[] metaData;
+ private Object[] correlationData;
+ private Object[] payloadData;
public Object[] getMetaData() {
@@ -33,7 +33,7 @@ public class DataContext {
}
public void setMetaData(Object[] metaData) {
- if(metaData == null) {
+ if (metaData == null) {
this.metaData = new Object[0];
} else {
this.metaData = Arrays.copyOf(metaData, metaData.length);
@@ -45,7 +45,7 @@ public class DataContext {
}
public void setCorrelationData(Object[] correlationData) {
- if(correlationData == null) {
+ if (correlationData == null) {
this.correlationData = new Object[0];
} else {
this.correlationData = Arrays.copyOf(correlationData, correlationData.length);
@@ -57,7 +57,7 @@ public class DataContext {
}
public void setPayloadData(Object[] payloadData) {
- if(payloadData == null) {
+ if (payloadData == null) {
this.payloadData = new Object[0];
} else {
this.payloadData = Arrays.copyOf(payloadData, payloadData.length);
http://git-wip-us.apache.org/repos/asf/stratos/blob/7519ffcd/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/data/publisher/DataPublisher.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/data/publisher/DataPublisher.java b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/data/publisher/DataPublisher.java
index 727beb6..189a30c 100644
--- a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/data/publisher/DataPublisher.java
+++ b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/data/publisher/DataPublisher.java
@@ -39,14 +39,14 @@ public abstract class DataPublisher implements GenericDataPublisher {
private AsyncDataPublisher dataPublisher;
private boolean isDataPublisherInitialized;
- public DataPublisher (DataPublisherConfiguration dataPublisherConfig, StreamDefinition streamDefinition) {
+ public DataPublisher(DataPublisherConfiguration dataPublisherConfig, StreamDefinition streamDefinition) {
this.dataPublisherConfig = dataPublisherConfig;
this.streamDefinition = streamDefinition;
this.setDataPublisherInitialized(false);
}
- public void initialize () {
+ public void initialize() {
AgentConfiguration agentConfiguration = new AgentConfiguration();
//System.setProperty("javax.net.ssl.trustStore", "/home/isuru/wso2/S2/apache/stratos/alpha/wso2bam-2.4.0/repository/resources/security/client-truststore.jks");
@@ -65,7 +65,7 @@ public abstract class DataPublisher implements GenericDataPublisher {
log.info("DataPublisher initialized");
}
- public void publish (DataContext dataContext) {
+ public void publish(DataContext dataContext) {
Event event = new Event();
event.setTimeStamp(new Date().getTime());
@@ -82,7 +82,7 @@ public abstract class DataPublisher implements GenericDataPublisher {
}
}
- public void terminate () {
+ public void terminate() {
dataPublisher.stop();
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/7519ffcd/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/data/publisher/DataPublisherConfiguration.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/data/publisher/DataPublisherConfiguration.java b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/data/publisher/DataPublisherConfiguration.java
index f0c4596..04abdf8 100644
--- a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/data/publisher/DataPublisherConfiguration.java
+++ b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/data/publisher/DataPublisherConfiguration.java
@@ -43,11 +43,11 @@ public class DataPublisherConfiguration {
private String adminPassword;
private static volatile DataPublisherConfiguration dataPublisherConfiguration;
- private DataPublisherConfiguration () {
+ private DataPublisherConfiguration() {
readConfig();
}
- private void readConfig () {
+ private void readConfig() {
String enabled = System.getProperty(ENABLE_DATA_PUBLISHER);
@@ -61,36 +61,36 @@ public class DataPublisherConfiguration {
log.info("Data publishing is enabled");
monitoringServerIp = System.getProperty(MONITORING_SERVER_IP);
- if(StringUtils.isBlank(monitoringServerIp)) {
+ if (StringUtils.isBlank(monitoringServerIp)) {
throw new RuntimeException("System property not found: " + MONITORING_SERVER_IP);
}
monitoringServerPort = System.getProperty(MONITORING_SERVER_PORT);
- if(StringUtils.isBlank(monitoringServerPort)) {
+ if (StringUtils.isBlank(monitoringServerPort)) {
throw new RuntimeException("System property not found: " + MONITORING_SERVER_PORT);
}
monitoringServerUrl = "tcp://" + monitoringServerIp + ":" + monitoringServerPort;
monitoringServerSecurePort = System.getProperty(MONITORING_SERVER_SECURE_PORT);
- if(StringUtils.isBlank(monitoringServerSecurePort)) {
+ if (StringUtils.isBlank(monitoringServerSecurePort)) {
throw new RuntimeException("System property not found: " + MONITORING_SERVER_SECURE_PORT);
}
adminUsername = System.getProperty(MONITORING_SERVER_ADMIN_USERNAME);
- if(StringUtils.isBlank(adminUsername)) {
+ if (StringUtils.isBlank(adminUsername)) {
throw new RuntimeException("System property not found: " + MONITORING_SERVER_ADMIN_USERNAME);
}
adminPassword = System.getProperty(MONITORING_SERVER_ADMIN_PASSWORD);
- if(StringUtils.isBlank(adminPassword)) {
+ if (StringUtils.isBlank(adminPassword)) {
throw new RuntimeException("System property not found: " + MONITORING_SERVER_ADMIN_PASSWORD);
}
log.info("Data Publisher configuration initialized");
}
- public static DataPublisherConfiguration getInstance () {
+ public static DataPublisherConfiguration getInstance() {
if (dataPublisherConfiguration == null) {
synchronized (DataPublisherConfiguration.class) {
http://git-wip-us.apache.org/repos/asf/stratos/blob/7519ffcd/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/data/publisher/GenericDataPublisher.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/data/publisher/GenericDataPublisher.java b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/data/publisher/GenericDataPublisher.java
index 4f8dd44..31adf55 100644
--- a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/data/publisher/GenericDataPublisher.java
+++ b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/data/publisher/GenericDataPublisher.java
@@ -21,9 +21,9 @@ package org.apache.stratos.cartridge.agent.data.publisher;
public interface GenericDataPublisher {
- public void initialize ();
+ public void initialize();
- public void publish (DataContext dataContext);
+ public void publish(DataContext dataContext);
- public void terminate ();
+ public void terminate();
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/7519ffcd/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/data/publisher/log/Constants.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/data/publisher/log/Constants.java b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/data/publisher/log/Constants.java
index 067961d..e4f4481 100644
--- a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/data/publisher/log/Constants.java
+++ b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/data/publisher/log/Constants.java
@@ -26,7 +26,7 @@ public class Constants {
public static String TAIL_COMMAND = "tail -n 100 -F ";
public static String MEMBER_ID = "memberId";
public static String LOG_EVENT = "logEvent";
-
+
public static String DATE_FORMATTER = "yyyy-MM-dd";
public static String DATE_TIME_FORMATTER = "yyyy-MM-dd HH:mm:ss,SSS";
public static String TENANT_ID = "tenantID";
@@ -36,7 +36,7 @@ public class Constants {
public static String PRIORITY = "priority";
public static String MESSAGE = "message";
public static String LOGGER = "logger";
- public static String IP = "ip";
+ public static String IP = "ip";
public static String INSTANCE = "instance";
public static String STACKTRACE = "stacktrace";
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/7519ffcd/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/data/publisher/log/FileBasedLogPublisher.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/data/publisher/log/FileBasedLogPublisher.java b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/data/publisher/log/FileBasedLogPublisher.java
index 01e681e..039c7c6 100644
--- a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/data/publisher/log/FileBasedLogPublisher.java
+++ b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/data/publisher/log/FileBasedLogPublisher.java
@@ -41,15 +41,15 @@ public class FileBasedLogPublisher extends LogPublisher implements Runnable {
public FileBasedLogPublisher(DataPublisherConfiguration dataPublisherConfig, StreamDefinition streamDefinition, String filePath, String memberId, String tenantId, String alias, Long datetime) {
- super(dataPublisherConfig, streamDefinition, filePath, memberId, tenantId, alias, datetime);
+ super(dataPublisherConfig, streamDefinition, filePath, memberId, tenantId, alias, datetime);
this.executorService = Executors.newSingleThreadExecutor(new FileBasedLogPublisherTaskThreadFactory(filePath));
}
- public void start () {
+ public void start() {
executorService.submit(this);
}
- public void stop () {
+ public void stop() {
// close the resources
try {
@@ -87,8 +87,8 @@ public class FileBasedLogPublisher extends LogPublisher implements Runnable {
DataContext dataContext = new DataContext();
// set the relevant data
dataContext.setCorrelationData(null);
- dataContext.setMetaData(new Object[] {memberId});
- dataContext.setPayloadData(new Object[] {tenantId, alias, "", datetime, "", scanner.nextLine(), "","",memberId, ""});
+ dataContext.setMetaData(new Object[]{memberId});
+ dataContext.setPayloadData(new Object[]{tenantId, alias, "", datetime, "", scanner.nextLine(), "", "", memberId, ""});
// publish data
publish(dataContext);
}
@@ -98,7 +98,7 @@ public class FileBasedLogPublisher extends LogPublisher implements Runnable {
private String filePath;
- public FileBasedLogPublisherTaskThreadFactory (String filePath) {
+ public FileBasedLogPublisherTaskThreadFactory(String filePath) {
this.filePath = filePath;
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/7519ffcd/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/data/publisher/log/LogPublisher.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/data/publisher/log/LogPublisher.java b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/data/publisher/log/LogPublisher.java
index ae7412c..662f475 100644
--- a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/data/publisher/log/LogPublisher.java
+++ b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/data/publisher/log/LogPublisher.java
@@ -36,7 +36,7 @@ public abstract class LogPublisher extends DataPublisher {
protected Long datetime;
protected String serverName;
- public LogPublisher (DataPublisherConfiguration dataPublisherConfig, StreamDefinition streamDefinition, String filePath, String memberId, String tenantId, String alias, Long datetime) {
+ public LogPublisher(DataPublisherConfiguration dataPublisherConfig, StreamDefinition streamDefinition, String filePath, String memberId, String tenantId, String alias, Long datetime) {
super(dataPublisherConfig, streamDefinition);
this.filePath = filePath;
@@ -46,11 +46,11 @@ public abstract class LogPublisher extends DataPublisher {
this.datetime = datetime;
}
- public void start () {
+ public void start() {
}
- public void stop () {
+ public void stop() {
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/7519ffcd/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/data/publisher/log/LogPublisherManager.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/data/publisher/log/LogPublisherManager.java b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/data/publisher/log/LogPublisherManager.java
index 8931463..a661c85 100644
--- a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/data/publisher/log/LogPublisherManager.java
+++ b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/data/publisher/log/LogPublisherManager.java
@@ -46,7 +46,7 @@ public class LogPublisherManager {
private static StreamDefinition streamDefinition = null;
private static List<LogPublisher> fileBasedLogPublishers = new ArrayList<LogPublisher>();
- public void init (DataPublisherConfiguration dataPublisherConfig) throws DataPublisherException {
+ public void init(DataPublisherConfiguration dataPublisherConfig) throws DataPublisherException {
this.dataPublisherConfig = dataPublisherConfig;
@@ -56,13 +56,13 @@ public class LogPublisherManager {
// wait till monitoring server ports are active
CartridgeAgentUtils.waitUntilPortsActive(dataPublisherConfig.getMonitoringServerIp(), ports);
- if(!CartridgeAgentUtils.checkPortsActive(dataPublisherConfig.getMonitoringServerIp(), ports)) {
+ if (!CartridgeAgentUtils.checkPortsActive(dataPublisherConfig.getMonitoringServerIp(), ports)) {
throw new DataPublisherException("Monitoring server not active, data publishing is aborted");
}
// stream definition identifier = {log.publisher.<cluster id>}
try {
- streamDefinition = new StreamDefinition(Constants.LOG_PUBLISHER_STREAM_PREFIX + getValidTenantId(CartridgeAgentConfiguration.getInstance().getTenantId()) + "." + getAlias(CartridgeAgentConfiguration.getInstance().getClusterId()) + "." + getCurrentDate(),
+ streamDefinition = new StreamDefinition(Constants.LOG_PUBLISHER_STREAM_PREFIX + getValidTenantId(CartridgeAgentConfiguration.getInstance().getTenantId()) + "." + getAlias(CartridgeAgentConfiguration.getInstance().getClusterId()) + "." + getCurrentDate(),
Constants.LOG_PUBLISHER_STREAM_VERSION);
} catch (MalformedStreamDefinitionException e) {
@@ -85,23 +85,23 @@ public class LogPublisherManager {
payloadDataDefinition.add(new Attribute(Constants.IP, AttributeType.STRING));
payloadDataDefinition.add(new Attribute(Constants.INSTANCE, AttributeType.STRING));
payloadDataDefinition.add(new Attribute(Constants.STACKTRACE, AttributeType.STRING));
-
+
streamDefinition.setMetaData(metaDataDefinition);
streamDefinition.setPayloadData(payloadDataDefinition);
}
- public void start (String filePath) throws DataPublisherException {
+ public void start(String filePath) throws DataPublisherException {
- File logFile = new File (filePath);
+ File logFile = new File(filePath);
if (!logFile.exists() || !logFile.canRead() || logFile.isDirectory()) {
throw new DataPublisherException("Unable to read the file at path " + filePath);
}
LogPublisher fileBasedLogPublisher = new FileBasedLogPublisher(dataPublisherConfig, streamDefinition, filePath,
- CartridgeAgentConfiguration.getInstance().getMemberId(),
- getValidTenantId(CartridgeAgentConfiguration.getInstance().getTenantId()),
- getAlias(CartridgeAgentConfiguration.getInstance().getClusterId()),
- getDateTime());
+ CartridgeAgentConfiguration.getInstance().getMemberId(),
+ getValidTenantId(CartridgeAgentConfiguration.getInstance().getTenantId()),
+ getAlias(CartridgeAgentConfiguration.getInstance().getClusterId()),
+ getDateTime());
fileBasedLogPublisher.initialize();
fileBasedLogPublisher.start();
@@ -110,45 +110,45 @@ public class LogPublisherManager {
fileBasedLogPublishers.add(fileBasedLogPublisher);
}
- public void stop () {
+ public void stop() {
+
+ if (dataPublisherConfig.isEnabled()) {
+ for (LogPublisher fileBasedLogPublisher : fileBasedLogPublishers) {
+ fileBasedLogPublisher.stop();
+ }
+ }
+ }
- if (dataPublisherConfig.isEnabled()) {
- for (LogPublisher fileBasedLogPublisher : fileBasedLogPublishers) {
- fileBasedLogPublisher.stop();
- }
- }
+ private String getCurrentDate() {
+ Date now = new Date();
+ DateFormat formatter = new SimpleDateFormat(Constants.DATE_FORMATTER);
+ String formattedDate = formatter.format(now);
+ return formattedDate.replace("-", ".");
}
-
- private String getCurrentDate() {
- Date now = new Date();
- DateFormat formatter = new SimpleDateFormat(Constants.DATE_FORMATTER);
- String formattedDate = formatter.format(now);
- return formattedDate.replace("-", ".");
- }
-
- private String getAlias(String clusterId) {
- String alias;
- try {
- alias = clusterId.split("\\.")[0];
- } catch (Exception e) {
+
+ private String getAlias(String clusterId) {
+ String alias;
+ try {
+ alias = clusterId.split("\\.")[0];
+ } catch (Exception e) {
log.error(e);
- alias = clusterId;
- }
- return alias;
- }
-
- private Long getDateTime() {
- Date date = new Date();
- return date.getTime();
- }
-
- private String getValidTenantId(String tenantId) {
- if (tenantId.equals(String
- .valueOf(MultitenantConstants.INVALID_TENANT_ID))
- || tenantId.equals(String
- .valueOf(MultitenantConstants.SUPER_TENANT_ID))) {
- return "0";
- }
- return tenantId;
- }
+ alias = clusterId;
+ }
+ return alias;
+ }
+
+ private Long getDateTime() {
+ Date date = new Date();
+ return date.getTime();
+ }
+
+ private String getValidTenantId(String tenantId) {
+ if (tenantId.equals(String
+ .valueOf(MultitenantConstants.INVALID_TENANT_ID))
+ || tenantId.equals(String
+ .valueOf(MultitenantConstants.SUPER_TENANT_ID))) {
+ return "0";
+ }
+ return tenantId;
+ }
}