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:50 UTC
[1/3] stratos git commit: Formatting cartridge agent module
Repository: stratos
Updated Branches:
refs/heads/master f533b5b4b -> 1034ba10a
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/event/publisher/CartridgeAgentEventPublisher.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/event/publisher/CartridgeAgentEventPublisher.java b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/event/publisher/CartridgeAgentEventPublisher.java
index c3b3f14..07c4dbb 100644
--- a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/event/publisher/CartridgeAgentEventPublisher.java
+++ b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/event/publisher/CartridgeAgentEventPublisher.java
@@ -39,35 +39,35 @@ import java.util.List;
* Cartridge agent event publisher.
*/
public class CartridgeAgentEventPublisher {
- private static final Log log = LogFactory
- .getLog(CartridgeAgentEventPublisher.class);
- private static boolean started;
- private static boolean activated;
- private static boolean readyToShutdown;
- private static boolean maintenance;
-
- public static void publishInstanceStartedEvent() {
- if (!isStarted()) {
- if (log.isInfoEnabled()) {
- log.info("Publishing instance started event");
- }
- InstanceStartedEvent event = new InstanceStartedEvent(
- //application_id = CartridgeAgentConfiguration().application_id
- CartridgeAgentConfiguration.getInstance().getApplicationId(),
- //service_name = CartridgeAgentConfiguration().service_name
- CartridgeAgentConfiguration.getInstance().getServiceName(),
- //cluster_id = CartridgeAgentConfiguration().cluster_id
- CartridgeAgentConfiguration.getInstance().getClusterId(),
- // member_id = CartridgeAgentConfiguration().member_id
- CartridgeAgentConfiguration.getInstance().getMemberId(),
-
- //cluster_instance_id = CartridgeAgentConfiguration().cluster_instance_id
- CartridgeAgentConfiguration.getInstance().getClusterInstanceId(),
- //network_partition_id = CartridgeAgentConfiguration().network_partition_id
- CartridgeAgentConfiguration.getInstance().getNetworkPartitionId(),
- //partition_id = CartridgeAgentConfiguration().partition_id
- CartridgeAgentConfiguration.getInstance().getPartitionId());
-
+ private static final Log log = LogFactory
+ .getLog(CartridgeAgentEventPublisher.class);
+ private static boolean started;
+ private static boolean activated;
+ private static boolean readyToShutdown;
+ private static boolean maintenance;
+
+ public static void publishInstanceStartedEvent() {
+ if (!isStarted()) {
+ if (log.isInfoEnabled()) {
+ log.info("Publishing instance started event");
+ }
+ InstanceStartedEvent event = new InstanceStartedEvent(
+ //application_id = CartridgeAgentConfiguration().application_id
+ CartridgeAgentConfiguration.getInstance().getApplicationId(),
+ //service_name = CartridgeAgentConfiguration().service_name
+ CartridgeAgentConfiguration.getInstance().getServiceName(),
+ //cluster_id = CartridgeAgentConfiguration().cluster_id
+ CartridgeAgentConfiguration.getInstance().getClusterId(),
+ // member_id = CartridgeAgentConfiguration().member_id
+ CartridgeAgentConfiguration.getInstance().getMemberId(),
+
+ //cluster_instance_id = CartridgeAgentConfiguration().cluster_instance_id
+ CartridgeAgentConfiguration.getInstance().getClusterInstanceId(),
+ //network_partition_id = CartridgeAgentConfiguration().network_partition_id
+ CartridgeAgentConfiguration.getInstance().getNetworkPartitionId(),
+ //partition_id = CartridgeAgentConfiguration().partition_id
+ CartridgeAgentConfiguration.getInstance().getPartitionId());
+
/*
*
@@ -87,164 +87,164 @@ public class CartridgeAgentEventPublisher {
log.info("Instance started event published")
*/
- String topic = MessagingUtil.getMessageTopicName(event);
- EventPublisher eventPublisher = EventPublisherPool
- .getPublisher(topic);
- eventPublisher.publish(event);
- setStarted(true);
- if (log.isInfoEnabled()) {
- log.info("Instance started event published");
- }
-
- } else {
- if (log.isWarnEnabled()) {
- log.warn("Instance already started");
- }
- }
- }
-
- public static void publishInstanceActivatedEvent() {
- if (!isActivated()) {
- // Wait for all ports to be active, if ports are not activated, do not publish instance activated since
- // the service is not up
- List<Integer> ports = CartridgeAgentConfiguration.getInstance().getPorts();
- String listenAddress = CartridgeAgentConfiguration.getInstance().getListenAddress();
- boolean portsActivated = CartridgeAgentUtils.waitUntilPortsActive(listenAddress, ports);
-
- if (portsActivated) {
- if (log.isInfoEnabled()) {
- log.info("Publishing instance activated event");
- }
- InstanceActivatedEvent event = new InstanceActivatedEvent(
- CartridgeAgentConfiguration.getInstance().getServiceName(),
- CartridgeAgentConfiguration.getInstance().getClusterId(),
- CartridgeAgentConfiguration.getInstance().getMemberId(),
- CartridgeAgentConfiguration.getInstance().getInstanceId(),
- CartridgeAgentConfiguration.getInstance().getClusterInstanceId(),
- CartridgeAgentConfiguration.getInstance().getNetworkPartitionId(),
- CartridgeAgentConfiguration.getInstance().getPartitionId());
-
- // Event publisher connection will
- String topic = MessagingUtil.getMessageTopicName(event);
- EventPublisher eventPublisher = EventPublisherPool
- .getPublisher(topic);
- eventPublisher.publish(event);
- if (log.isInfoEnabled()) {
- log.info("Instance activated event published");
- }
-
- if (log.isInfoEnabled()) {
- log.info("Starting health statistics notifier");
- }
- Thread thread = new Thread(new HealthStatisticsNotifier());
- thread.start();
- setActivated(true);
- if (log.isInfoEnabled()) {
- log.info("Health statistics notifier started");
- }
- } else {
- if (log.isInfoEnabled()) {
- // There would not be a large number of ports
- String portsStr = "";
- for (Integer port: ports){
- portsStr += port + ", ";
- }
- log.error(String.format(
- "Ports activation timed out. Aborting InstanceActivatedEvent publishing. [IPAddress] %s [Ports] %s",
- listenAddress,
- portsStr));
- }
- }
- } else {
- if (log.isWarnEnabled()) {
- log.warn("Instance already activated");
- }
- }
- }
-
- public static void publishInstanceReadyToShutdownEvent() {
- if (!isReadyToShutdown()) {
- if (log.isInfoEnabled()) {
- log.info("Publishing instance activated event");
- }
- InstanceReadyToShutdownEvent event = new InstanceReadyToShutdownEvent(
- CartridgeAgentConfiguration.getInstance().getServiceName(),
- CartridgeAgentConfiguration.getInstance().getClusterId(),
- CartridgeAgentConfiguration.getInstance().getMemberId(),
- CartridgeAgentConfiguration.getInstance().getClusterInstanceId(),
- CartridgeAgentConfiguration.getInstance().getNetworkPartitionId(),
- CartridgeAgentConfiguration.getInstance().getPartitionId());
- String topic = MessagingUtil.getMessageTopicName(event);
- EventPublisher eventPublisher = EventPublisherPool
- .getPublisher(topic);
- eventPublisher.publish(event);
- setReadyToShutdown(true);
- if (log.isInfoEnabled()) {
- log.info("Instance ReadyToShutDown event published");
- }
- } else {
- if (log.isWarnEnabled()) {
- log.warn("Instance already sent ReadyToShutDown event....");
- }
- }
- }
-
- public static void publishMaintenanceModeEvent() {
- if (!isMaintenance()) {
- if (log.isInfoEnabled()) {
- log.info("Publishing instance maintenance mode event");
- }
- InstanceMaintenanceModeEvent event = new InstanceMaintenanceModeEvent(
- CartridgeAgentConfiguration.getInstance().getServiceName(),
- CartridgeAgentConfiguration.getInstance().getClusterId(),
- CartridgeAgentConfiguration.getInstance().getMemberId(),
- CartridgeAgentConfiguration.getInstance().getClusterInstanceId(),
- CartridgeAgentConfiguration.getInstance().getNetworkPartitionId(),
- CartridgeAgentConfiguration.getInstance().getPartitionId());
- String topic = MessagingUtil.getMessageTopicName(event);
- EventPublisher eventPublisher = EventPublisherPool
- .getPublisher(topic);
- eventPublisher.publish(event);
- setMaintenance(true);
- if (log.isInfoEnabled()) {
- log.info("Instance Maintenance mode event published");
- }
- } else {
- if (log.isWarnEnabled()) {
- log.warn("Instance already in a Maintenance mode....");
- }
- }
- }
-
- public static boolean isStarted() {
- return started;
- }
-
- public static void setStarted(boolean started) {
- CartridgeAgentEventPublisher.started = started;
- }
-
- public static boolean isActivated() {
- return activated;
- }
-
- public static void setActivated(boolean activated) {
- CartridgeAgentEventPublisher.activated = activated;
- }
-
- public static boolean isReadyToShutdown() {
- return readyToShutdown;
- }
-
- public static void setReadyToShutdown(boolean readyToShutdown) {
- CartridgeAgentEventPublisher.readyToShutdown = readyToShutdown;
- }
-
- public static boolean isMaintenance() {
- return maintenance;
- }
-
- public static void setMaintenance(boolean maintenance) {
- CartridgeAgentEventPublisher.maintenance = maintenance;
- }
+ String topic = MessagingUtil.getMessageTopicName(event);
+ EventPublisher eventPublisher = EventPublisherPool
+ .getPublisher(topic);
+ eventPublisher.publish(event);
+ setStarted(true);
+ if (log.isInfoEnabled()) {
+ log.info("Instance started event published");
+ }
+
+ } else {
+ if (log.isWarnEnabled()) {
+ log.warn("Instance already started");
+ }
+ }
+ }
+
+ public static void publishInstanceActivatedEvent() {
+ if (!isActivated()) {
+ // Wait for all ports to be active, if ports are not activated, do not publish instance activated since
+ // the service is not up
+ List<Integer> ports = CartridgeAgentConfiguration.getInstance().getPorts();
+ String listenAddress = CartridgeAgentConfiguration.getInstance().getListenAddress();
+ boolean portsActivated = CartridgeAgentUtils.waitUntilPortsActive(listenAddress, ports);
+
+ if (portsActivated) {
+ if (log.isInfoEnabled()) {
+ log.info("Publishing instance activated event");
+ }
+ InstanceActivatedEvent event = new InstanceActivatedEvent(
+ CartridgeAgentConfiguration.getInstance().getServiceName(),
+ CartridgeAgentConfiguration.getInstance().getClusterId(),
+ CartridgeAgentConfiguration.getInstance().getMemberId(),
+ CartridgeAgentConfiguration.getInstance().getInstanceId(),
+ CartridgeAgentConfiguration.getInstance().getClusterInstanceId(),
+ CartridgeAgentConfiguration.getInstance().getNetworkPartitionId(),
+ CartridgeAgentConfiguration.getInstance().getPartitionId());
+
+ // Event publisher connection will
+ String topic = MessagingUtil.getMessageTopicName(event);
+ EventPublisher eventPublisher = EventPublisherPool
+ .getPublisher(topic);
+ eventPublisher.publish(event);
+ if (log.isInfoEnabled()) {
+ log.info("Instance activated event published");
+ }
+
+ if (log.isInfoEnabled()) {
+ log.info("Starting health statistics notifier");
+ }
+ Thread thread = new Thread(new HealthStatisticsNotifier());
+ thread.start();
+ setActivated(true);
+ if (log.isInfoEnabled()) {
+ log.info("Health statistics notifier started");
+ }
+ } else {
+ if (log.isInfoEnabled()) {
+ // There would not be a large number of ports
+ String portsStr = "";
+ for (Integer port : ports) {
+ portsStr += port + ", ";
+ }
+ log.error(String.format(
+ "Ports activation timed out. Aborting InstanceActivatedEvent publishing. [IPAddress] %s [Ports] %s",
+ listenAddress,
+ portsStr));
+ }
+ }
+ } else {
+ if (log.isWarnEnabled()) {
+ log.warn("Instance already activated");
+ }
+ }
+ }
+
+ public static void publishInstanceReadyToShutdownEvent() {
+ if (!isReadyToShutdown()) {
+ if (log.isInfoEnabled()) {
+ log.info("Publishing instance activated event");
+ }
+ InstanceReadyToShutdownEvent event = new InstanceReadyToShutdownEvent(
+ CartridgeAgentConfiguration.getInstance().getServiceName(),
+ CartridgeAgentConfiguration.getInstance().getClusterId(),
+ CartridgeAgentConfiguration.getInstance().getMemberId(),
+ CartridgeAgentConfiguration.getInstance().getClusterInstanceId(),
+ CartridgeAgentConfiguration.getInstance().getNetworkPartitionId(),
+ CartridgeAgentConfiguration.getInstance().getPartitionId());
+ String topic = MessagingUtil.getMessageTopicName(event);
+ EventPublisher eventPublisher = EventPublisherPool
+ .getPublisher(topic);
+ eventPublisher.publish(event);
+ setReadyToShutdown(true);
+ if (log.isInfoEnabled()) {
+ log.info("Instance ReadyToShutDown event published");
+ }
+ } else {
+ if (log.isWarnEnabled()) {
+ log.warn("Instance already sent ReadyToShutDown event....");
+ }
+ }
+ }
+
+ public static void publishMaintenanceModeEvent() {
+ if (!isMaintenance()) {
+ if (log.isInfoEnabled()) {
+ log.info("Publishing instance maintenance mode event");
+ }
+ InstanceMaintenanceModeEvent event = new InstanceMaintenanceModeEvent(
+ CartridgeAgentConfiguration.getInstance().getServiceName(),
+ CartridgeAgentConfiguration.getInstance().getClusterId(),
+ CartridgeAgentConfiguration.getInstance().getMemberId(),
+ CartridgeAgentConfiguration.getInstance().getClusterInstanceId(),
+ CartridgeAgentConfiguration.getInstance().getNetworkPartitionId(),
+ CartridgeAgentConfiguration.getInstance().getPartitionId());
+ String topic = MessagingUtil.getMessageTopicName(event);
+ EventPublisher eventPublisher = EventPublisherPool
+ .getPublisher(topic);
+ eventPublisher.publish(event);
+ setMaintenance(true);
+ if (log.isInfoEnabled()) {
+ log.info("Instance Maintenance mode event published");
+ }
+ } else {
+ if (log.isWarnEnabled()) {
+ log.warn("Instance already in a Maintenance mode....");
+ }
+ }
+ }
+
+ public static boolean isStarted() {
+ return started;
+ }
+
+ public static void setStarted(boolean started) {
+ CartridgeAgentEventPublisher.started = started;
+ }
+
+ public static boolean isActivated() {
+ return activated;
+ }
+
+ public static void setActivated(boolean activated) {
+ CartridgeAgentEventPublisher.activated = activated;
+ }
+
+ public static boolean isReadyToShutdown() {
+ return readyToShutdown;
+ }
+
+ public static void setReadyToShutdown(boolean readyToShutdown) {
+ CartridgeAgentEventPublisher.readyToShutdown = readyToShutdown;
+ }
+
+ public static boolean isMaintenance() {
+ return maintenance;
+ }
+
+ public static void setMaintenance(boolean maintenance) {
+ CartridgeAgentEventPublisher.maintenance = maintenance;
+ }
}
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/extensions/DefaultExtensionHandler.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/extensions/DefaultExtensionHandler.java b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/extensions/DefaultExtensionHandler.java
index 91a76af..8f52bd4 100644
--- a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/extensions/DefaultExtensionHandler.java
+++ b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/extensions/DefaultExtensionHandler.java
@@ -246,12 +246,12 @@ public class DefaultExtensionHandler implements ExtensionHandler {
}
return;
}
-
+
Map<String, String> env = new HashMap<String, String>();
ExtensionUtils.executeMemberActivatedExtension(env);
}
-
+
@Override
public void onCompleteTopologyEvent(CompleteTopologyEvent completeTopologyEvent) {
if (log.isDebugEnabled()) {
@@ -293,11 +293,11 @@ public class DefaultExtensionHandler implements ExtensionHandler {
Member activatedMember = ExtensionUtils.getMemberFromTopology(serviceNameInPayload, clusterIdInPayload, memberIdInPayload);
if (activatedMember == null) {
// if this member isn't there in the complete topology
- if (log.isDebugEnabled()) {
+ if (log.isDebugEnabled()) {
log.debug("Member does not exist in topology, or not in initialized state.");
}
} else {
- if (log.isDebugEnabled()) {
+ if (log.isDebugEnabled()) {
log.debug("Member has initialized, topology is consistent, agent is initialized");
}
@@ -355,7 +355,7 @@ public class DefaultExtensionHandler implements ExtensionHandler {
}
return;
}
-
+
Map<String, String> env = new HashMap<String, String>();
ExtensionUtils.executeMemberTerminatedExtension(env);
@@ -381,7 +381,7 @@ public class DefaultExtensionHandler implements ExtensionHandler {
}
return;
}
-
+
Map<String, String> env = new HashMap<String, String>();
ExtensionUtils.executeMemberSuspendedExtension(env);
@@ -407,7 +407,7 @@ public class DefaultExtensionHandler implements ExtensionHandler {
}
return;
}
-
+
Map<String, String> env = new HashMap<String, String>();
ExtensionUtils.executeMemberStartedExtension(env);
@@ -433,7 +433,7 @@ public class DefaultExtensionHandler implements ExtensionHandler {
}
return;
}
-
+
Map<String, String> env = new HashMap<String, String>();
ExtensionUtils.executeStartServersExtension(env);
@@ -558,13 +558,13 @@ public class DefaultExtensionHandler implements ExtensionHandler {
Map<String, String> env = new HashMap<String, String>();
ExtensionUtils.executeTenantUnSubscribedExtension(env);
}
-
+
//ApplicationSignUpRemovedEvent
@Override
public void onApplicationSignUpRemovedEvent(ApplicationSignUpRemovedEvent applicationSignUpRemovedEvent) {
if (log.isInfoEnabled()) {
log.info(String.format("applicationSignUpRemovedEvent event received: [appId] %s [tenantId] %s ",
- applicationSignUpRemovedEvent.getApplicationId(), applicationSignUpRemovedEvent.getTenantId()));
+ applicationSignUpRemovedEvent.getApplicationId(), applicationSignUpRemovedEvent.getTenantId()));
}
try {
@@ -574,7 +574,7 @@ public class DefaultExtensionHandler implements ExtensionHandler {
} catch (Exception e) {
log.error(e);
}
-
+
}
}
\ No newline at end of file
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/extensions/ExtensionHandler.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/extensions/ExtensionHandler.java b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/extensions/ExtensionHandler.java
index 74cc6dd..5e3641d 100644
--- a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/extensions/ExtensionHandler.java
+++ b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/extensions/ExtensionHandler.java
@@ -31,9 +31,9 @@ import org.apache.stratos.messaging.event.tenant.TenantUnSubscribedEvent;
import org.apache.stratos.messaging.event.topology.*;
public interface ExtensionHandler {
-
- public void onMemberCreatedEvent(MemberCreatedEvent memberCreatedEvent);
-
+
+ public void onMemberCreatedEvent(MemberCreatedEvent memberCreatedEvent);
+
public void onInstanceStartedEvent();
public void onInstanceActivatedEvent();
@@ -57,8 +57,8 @@ public interface ExtensionHandler {
public void onMemberSuspendedEvent(MemberSuspendedEvent memberSuspendedEvent);
public void onMemberStartedEvent(MemberStartedEvent memberStartedEvent);
-
- public void onMemberInitializedEvent(MemberInitializedEvent memberInitializedEvent);
+
+ public void onMemberInitializedEvent(MemberInitializedEvent memberInitializedEvent);
public void startServerExtension();
@@ -73,7 +73,7 @@ public interface ExtensionHandler {
public void onTenantSubscribedEvent(TenantSubscribedEvent tenantSubscribedEvent);
public void onTenantUnSubscribedEvent(TenantUnSubscribedEvent tenantUnSubscribedEvent);
-
+
public void onApplicationSignUpRemovedEvent(ApplicationSignUpRemovedEvent applicationSignUpRemovedEvent);
}
\ No newline at end of file
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/statistics/publisher/CartridgeStatistics.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/statistics/publisher/CartridgeStatistics.java b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/statistics/publisher/CartridgeStatistics.java
index f92de2d..dd2dfe4 100644
--- a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/statistics/publisher/CartridgeStatistics.java
+++ b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/statistics/publisher/CartridgeStatistics.java
@@ -30,7 +30,7 @@ public class CartridgeStatistics {
/**
* Constructor
*
- * @param memUsage the consumed memory, as a percentage of the available memory to the cartridge
+ * @param memUsage the consumed memory, as a percentage of the available memory to the cartridge
* @param procUsage the processing used, as a percentage of the processing available to the cartridge
*/
public CartridgeStatistics(double memUsage, double procUsage) {
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/statistics/publisher/HealthStatisticsNotifier.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/statistics/publisher/HealthStatisticsNotifier.java b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/statistics/publisher/HealthStatisticsNotifier.java
index dc1aa86..74c5156 100644
--- a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/statistics/publisher/HealthStatisticsNotifier.java
+++ b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/statistics/publisher/HealthStatisticsNotifier.java
@@ -47,36 +47,26 @@ public class HealthStatisticsNotifier implements Runnable {
/* Find all jars in the current working directory */
String pluginFileName = System.getProperty("health.stats.reader.plugin");
- if ((pluginFileName != null) && (pluginFileName.length() != 0))
- {
+ if ((pluginFileName != null) && (pluginFileName.length() != 0)) {
File pluginFile = new File(pluginFileName);
- if ( (pluginFile != null)
- && (pluginFile.exists())) {
+ if ((pluginFile != null)
+ && (pluginFile.exists())) {
List<Class> pluginClass = PluginLoader.loadPluginClassesFromJar(pluginFile, IHealthStatisticsReader.class);
- if (!pluginClass.isEmpty())
- {
- try
- {
+ if (!pluginClass.isEmpty()) {
+ try {
log.trace("Instantiating new instance of plugin type " + pluginClass);
- this.statsReader = (IHealthStatisticsReader)pluginClass.get(0).newInstance( );
- }
- catch(InstantiationException e)
- {
+ this.statsReader = (IHealthStatisticsReader) pluginClass.get(0).newInstance();
+ } catch (InstantiationException e) {
log.error("Unable to instantiate plugin " + pluginClass, e);
- }
- catch(IllegalAccessException e)
- {
+ } catch (IllegalAccessException e) {
log.error("Unable to instantiate plugin " + pluginClass, e);
}
}
- }
- else
- {
- log.error("Plugin not found or malformed: " + pluginFileName + ((pluginFile == null)? " NULL": "Doesn't exist"));
+ } else {
+ log.error("Plugin not found or malformed: " + pluginFileName + ((pluginFile == null) ? " NULL" : "Doesn't exist"));
}
}
- if (this.statsReader == null)
- {
+ if (this.statsReader == null) {
this.statsReader = new HealthStatisticsReader();
}
@@ -88,12 +78,9 @@ public class HealthStatisticsNotifier implements Runnable {
@Override
public void run() {
- if (this.statsReader.init() == false)
- {
- log.error("Health statistics reader "+this.statsReader.getClass().getName()+" could not initialise");
- }
- else
- {
+ if (this.statsReader.init() == false) {
+ log.error("Health statistics reader " + this.statsReader.getClass().getName() + " could not initialise");
+ } else {
while (!terminated) {
try {
try {
@@ -105,7 +92,7 @@ public class HealthStatisticsNotifier implements Runnable {
CartridgeStatistics stats = statsReader.getCartridgeStatistics();
- if(log.isDebugEnabled()) {
+ if (log.isDebugEnabled()) {
log.debug(String.format("Publishing memory consumption: %f", stats.getMemoryUsage()));
}
statsPublisher.publish(
@@ -118,7 +105,7 @@ public class HealthStatisticsNotifier implements Runnable {
stats.getMemoryUsage()
);
- if(log.isDebugEnabled()) {
+ if (log.isDebugEnabled()) {
log.debug(String.format("Publishing load average: %f", stats.getProcessorUsage()));
}
statsPublisher.publish(
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/statistics/publisher/HealthStatisticsReader.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/statistics/publisher/HealthStatisticsReader.java b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/statistics/publisher/HealthStatisticsReader.java
index c7c7e52..b6f4e68 100644
--- a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/statistics/publisher/HealthStatisticsReader.java
+++ b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/statistics/publisher/HealthStatisticsReader.java
@@ -38,87 +38,87 @@ public class HealthStatisticsReader implements IHealthStatisticsReader {
private static final int MB = 1024 * 1024;
private static final Log log = LogFactory.getLog(HealthStatisticsReader.class);
-
+
public boolean init() {
return true;
}
public static double getMemoryConsumption() {
- double totalMemory = 0, usedMemory = 0;
-
- if (isWindows()) {
- OperatingSystemMXBean osBean = (OperatingSystemMXBean) ManagementFactory.getOperatingSystemMXBean();
- totalMemory = (double)(osBean.getTotalPhysicalMemorySize()/ MB);
- usedMemory = (double)((totalMemory - (osBean.getFreePhysicalMemorySize() / MB) ));
- } else {
- String fName = "/proc/meminfo";
- try {
- FileInputStream f = new FileInputStream(fName);
+ double totalMemory = 0, usedMemory = 0;
+
+ if (isWindows()) {
+ OperatingSystemMXBean osBean = (OperatingSystemMXBean) ManagementFactory.getOperatingSystemMXBean();
+ totalMemory = (double) (osBean.getTotalPhysicalMemorySize() / MB);
+ usedMemory = (double) ((totalMemory - (osBean.getFreePhysicalMemorySize() / MB)));
+ } else {
+ String fName = "/proc/meminfo";
+ try {
+ FileInputStream f = new FileInputStream(fName);
/* $ cat /proc/meminfo
- * MemTotal: 2056964 kB
+ * MemTotal: 2056964 kB
* MemFree: 16716 kB
* Buffers: 9776 kB
* Cached: 127220 kB
*/
- Scanner scanner = new Scanner(f).useDelimiter("\\D+");
- try {
- long memTotal = scanner.nextLong();
- long memFree = scanner.nextLong();
- long buffers = scanner.nextLong();
- long cached = scanner.nextLong();
-
- totalMemory = memTotal;
- usedMemory = memTotal - (memFree + buffers + cached);
- } catch (Exception ex) {
- log.error("Could not calculate memory usage.", ex);
- } finally {
- scanner.close();
- }
- } catch (IOException ex) {
- log.error("Could not calculate memory usage.", ex);
- }
- }
-
- if(log.isDebugEnabled()) {
- log.debug("Calculating memory consumption: [totalMemory] "+totalMemory+" [usedMemory] "+usedMemory);
+ Scanner scanner = new Scanner(f).useDelimiter("\\D+");
+ try {
+ long memTotal = scanner.nextLong();
+ long memFree = scanner.nextLong();
+ long buffers = scanner.nextLong();
+ long cached = scanner.nextLong();
+
+ totalMemory = memTotal;
+ usedMemory = memTotal - (memFree + buffers + cached);
+ } catch (Exception ex) {
+ log.error("Could not calculate memory usage.", ex);
+ } finally {
+ scanner.close();
+ }
+ } catch (IOException ex) {
+ log.error("Could not calculate memory usage.", ex);
+ }
+ }
+
+ if (log.isDebugEnabled()) {
+ log.debug("Calculating memory consumption: [totalMemory] " + totalMemory + " [usedMemory] " + usedMemory);
}
double memoryConsumption = (usedMemory / totalMemory) * 100;
- if(log.isDebugEnabled()) {
- log.debug("Calculating memory consumption: [percentage] "+memoryConsumption);
+ if (log.isDebugEnabled()) {
+ log.debug("Calculating memory consumption: [percentage] " + memoryConsumption);
}
return memoryConsumption;
}
public static double getLoadAverage() {
- double loadAvg = (double)ManagementFactory.getOperatingSystemMXBean().getSystemLoadAverage();
- // assume system cores = available cores to JVM
- int cores = ManagementFactory.getOperatingSystemMXBean().getAvailableProcessors();
-
- if(log.isDebugEnabled()) {
- log.debug("Calculating load average consumption: [loadAverage] "+loadAvg+" [cores] "+cores);
+ double loadAvg = (double) ManagementFactory.getOperatingSystemMXBean().getSystemLoadAverage();
+ // assume system cores = available cores to JVM
+ int cores = ManagementFactory.getOperatingSystemMXBean().getAvailableProcessors();
+
+ if (log.isDebugEnabled()) {
+ log.debug("Calculating load average consumption: [loadAverage] " + loadAvg + " [cores] " + cores);
}
-
- double loadAvgPercentage = (loadAvg/cores) * 100;
- if(log.isDebugEnabled()) {
- log.debug("Calculating load average consumption: [percentage] "+loadAvgPercentage);
+
+ double loadAvgPercentage = (loadAvg / cores) * 100;
+ if (log.isDebugEnabled()) {
+ log.debug("Calculating load average consumption: [percentage] " + loadAvgPercentage);
}
- return loadAvgPercentage;
+ return loadAvgPercentage;
}
-
+
public CartridgeStatistics getCartridgeStatistics() throws IOException {
OperatingSystemMXBean osBean = (OperatingSystemMXBean) ManagementFactory.getOperatingSystemMXBean();
- double totalMemory = (double)(osBean.getTotalPhysicalMemorySize()/ MB);
- double usedMemory = (double)((totalMemory - (osBean.getFreePhysicalMemorySize() / MB) ));
- double loadAvg = (double)osBean.getSystemLoadAverage();
+ double totalMemory = (double) (osBean.getTotalPhysicalMemorySize() / MB);
+ double usedMemory = (double) ((totalMemory - (osBean.getFreePhysicalMemorySize() / MB)));
+ double loadAvg = (double) osBean.getSystemLoadAverage();
// assume system cores = available cores to JVM
int cores = osBean.getAvailableProcessors();
double memoryConsumption = (usedMemory / totalMemory) * 100;
- double loadAvgPercentage = (loadAvg/cores) * 100;
+ double loadAvgPercentage = (loadAvg / cores) * 100;
- if(log.isDebugEnabled()) {
- log.debug("Memory consumption: [totalMemory] "+totalMemory+"Mb [usedMemory] "+usedMemory+"Mb: "+memoryConsumption+"%");
- log.debug("Processor consumption: [loadAverage] "+loadAvg+" [cores] "+cores+": "+loadAvgPercentage+"%");
+ if (log.isDebugEnabled()) {
+ log.debug("Memory consumption: [totalMemory] " + totalMemory + "Mb [usedMemory] " + usedMemory + "Mb: " + memoryConsumption + "%");
+ log.debug("Processor consumption: [loadAverage] " + loadAvg + " [cores] " + cores + ": " + loadAvgPercentage + "%");
}
return (new CartridgeStatistics(memoryConsumption, loadAvgPercentage));
@@ -127,9 +127,9 @@ public class HealthStatisticsReader implements IHealthStatisticsReader {
public static boolean allPortsActive() {
return CartridgeAgentUtils.checkPortsActive(CartridgeAgentConfiguration.getInstance().getListenAddress(),
- CartridgeAgentConfiguration.getInstance().getPorts());
+ CartridgeAgentConfiguration.getInstance().getPorts());
}
-
+
private static boolean isWindows() {
String os = System.getProperty("os.name").toLowerCase();
return os.indexOf("win") >= 0;
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/statistics/publisher/IHealthStatisticsReader.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/statistics/publisher/IHealthStatisticsReader.java b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/statistics/publisher/IHealthStatisticsReader.java
index ddb4539..edc0279 100644
--- a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/statistics/publisher/IHealthStatisticsReader.java
+++ b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/statistics/publisher/IHealthStatisticsReader.java
@@ -28,7 +28,7 @@ public interface IHealthStatisticsReader {
/**
* Called exactly once, before any other method.
- *
+ * <p/>
* Should be used, along with {@link #delete()}, to manage "unmanaged"
* resources, e.g. sockets. Standard objects will of course be managed by
* GC in the usual way and should be allocated in the ctor.
@@ -37,16 +37,16 @@ public interface IHealthStatisticsReader {
/**
* Called repeatedly to obtain memory and processor use.
- *
+ * <p/>
* Obtained from the cartridge agent hosti.
- *
+ * <p/>
* Can throw IOException if the required metrics were not obtainable.
*/
public CartridgeStatistics getCartridgeStatistics() throws IOException;
/**
* Called exactly once, after all other methods.
- *
+ * <p/>
* Should be used, along with {@link #init()}, to manage "unmanaged"
* resources, e.g. sockets. Standard objects will of course be managed by
* GC in the usual way and will be collected when no longer referenced.
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/statistics/publisher/PluginLoader.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/statistics/publisher/PluginLoader.java b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/statistics/publisher/PluginLoader.java
index afd6394..a326c5e 100644
--- a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/statistics/publisher/PluginLoader.java
+++ b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/statistics/publisher/PluginLoader.java
@@ -15,8 +15,7 @@ import java.util.jar.*;
import java.util.zip.*;
-public class PluginLoader
-{
+public class PluginLoader {
private static final Log log = LogFactory.getLog(PluginLoader.class);
/* Built-in plugins are listed here. This is just easier than adding this
@@ -26,60 +25,47 @@ public class PluginLoader
* that would probably be OK, but it's more logic.
*/
- public static List<Class> loadPluginClassesFromJar( File jarPath, Class pluginInterface )
- {
- List<Class> listeners = new LinkedList<Class>( );
+ public static List<Class> loadPluginClassesFromJar(File jarPath, Class pluginInterface) {
+ List<Class> listeners = new LinkedList<Class>();
- try
- {
- URLClassLoader loader = new URLClassLoader( new URL[] { jarPath.toURI().toURL() } );
- JarFile jar = new JarFile( jarPath );
+ try {
+ URLClassLoader loader = new URLClassLoader(new URL[]{jarPath.toURI().toURL()});
+ JarFile jar = new JarFile(jarPath);
Enumeration<? extends JarEntry> jarEnum = jar.entries();
- log.trace( "Scanning jar file " + jarPath );
+ log.trace("Scanning jar file " + jarPath);
- while( jarEnum.hasMoreElements() )
- {
+ while (jarEnum.hasMoreElements()) {
ZipEntry zipEntry = jarEnum.nextElement();
String fileName = zipEntry.getName();
- if( fileName.endsWith( ".class" ) )
- {
- log.trace( "Considering jar entry " + fileName );
- try
- {
- String className = fileName.replace( ".class", "" ).replace( "/", "." );
- Class cls = loader.loadClass( className );
- log.trace( "Loaded class " + className );
+ if (fileName.endsWith(".class")) {
+ log.trace("Considering jar entry " + fileName);
+ try {
+ String className = fileName.replace(".class", "").replace("/", ".");
+ Class cls = loader.loadClass(className);
+ log.trace("Loaded class " + className);
- if( hasInterface( cls, pluginInterface ) )
- {
- log.trace( "Class has " + pluginInterface.getName() + " interface; adding " );
- listeners.add( cls );
+ if (hasInterface(cls, pluginInterface)) {
+ log.trace("Class has " + pluginInterface.getName() + " interface; adding ");
+ listeners.add(cls);
}
- }
- catch( ClassNotFoundException e )
- {
- log.error( "Unable to load class from " + fileName + " in " + jarPath );
+ } catch (ClassNotFoundException e) {
+ log.error("Unable to load class from " + fileName + " in " + jarPath);
}
}
}
- }
- catch( IOException e )
- {
- log.error( "Unable to open JAR file " + jarPath, e );
+ } catch (IOException e) {
+ log.error("Unable to open JAR file " + jarPath, e);
}
return listeners;
}
- private static boolean hasInterface( Class cls, Class iface )
- {
- for( Class in : cls.getInterfaces() )
- {
- if( in == iface )
- {
+ private static boolean hasInterface(Class cls, Class iface) {
+ for (Class in : cls.getInterfaces()) {
+ if (in == iface) {
return true;
}
}
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/util/CartridgeAgentConstants.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/util/CartridgeAgentConstants.java b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/util/CartridgeAgentConstants.java
index 550a3a2..0c81f60 100644
--- a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/util/CartridgeAgentConstants.java
+++ b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/util/CartridgeAgentConstants.java
@@ -21,15 +21,15 @@ package org.apache.stratos.cartridge.agent.util;
import java.io.Serializable;
-public class CartridgeAgentConstants implements Serializable{
+public class CartridgeAgentConstants implements Serializable {
- public static final String JNDI_PROPERTIES_DIR = "jndi.properties.dir";
- public static final String PARAM_FILE_PATH = "param.file.path";
+ public static final String JNDI_PROPERTIES_DIR = "jndi.properties.dir";
+ public static final String PARAM_FILE_PATH = "param.file.path";
public static final String EXTENSIONS_DIR = "extensions.dir";
- public static final String CARTRIDGE_KEY = "CARTRIDGE_KEY";
- public static final String APPLICATION_PATH = "APPLICATION_PATH";
- public static final String APPLICATION_ID = "APPLICATION_ID";
+ public static final String CARTRIDGE_KEY = "CARTRIDGE_KEY";
+ public static final String APPLICATION_PATH = "APPLICATION_PATH";
+ public static final String APPLICATION_ID = "APPLICATION_ID";
public static final String SERVICE_GROUP = "SERIVCE_GROUP";
public static final String SERVICE_NAME = "SERVICE_NAME";
public static final String CLUSTER_ID = "CLUSTER_ID";
@@ -37,7 +37,7 @@ public class CartridgeAgentConstants implements Serializable{
public static final String NETWORK_PARTITION_ID = "NETWORK_PARTITION_ID";
public static final String PARTITION_ID = "PARTITION_ID";
public static final String MEMBER_ID = "MEMBER_ID";
- public static final String TENANT_ID= "TENANT_ID";
+ public static final String TENANT_ID = "TENANT_ID";
public static final String REPO_URL = "REPO_URL";
public static final String PORTS = "PORTS";
public static final String DEPLOYMENT = "DEPLOYMENT";
@@ -87,7 +87,7 @@ public class CartridgeAgentConstants implements Serializable{
public static final String SERVICE_GROUP_TOPOLOGY_KEY = "payload_parameter.SERIVCE_GROUP";
public static final String CLUSTERING_TOPOLOGY_KEY = "payload_parameter.CLUSTERING";
public static final String CLUSTERING_PRIMARY_KEY = "PRIMARY";
-
+
public static final String SUPERTENANT_TEMP_PATH = "/tmp/-1234/";
public static final String DEPLOYMENT_MANAGER = "manager";
@@ -95,7 +95,7 @@ public class CartridgeAgentConstants implements Serializable{
public static final String DEPLOYMENT_DEFAULT = "default";
public static final String SUPER_TENANT_REPO_PATH = "super.tenant.repository.path";
public static final String TENANT_REPO_PATH = "tenant.repository.path";
-
+
public static final String KUBERNETES_CLUSTER_ID = "KUBERNETES_CLUSTER_ID";
public static final String KUBERNETES_MASTER_IP = "KUBERNETES_MASTER_IP";
}
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/util/CartridgeAgentUtils.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/util/CartridgeAgentUtils.java b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/util/CartridgeAgentUtils.java
index 3dfe50a..c06adf1 100644
--- a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/util/CartridgeAgentUtils.java
+++ b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/util/CartridgeAgentUtils.java
@@ -52,11 +52,11 @@ public class CartridgeAgentUtils {
}
public static String decryptPassword(String repoUserPassword) {
-
- if(repoUserPassword == null) {
- return repoUserPassword;
- }
-
+
+ if (repoUserPassword == null) {
+ return repoUserPassword;
+ }
+
String decryptPassword = "";
String secret = CartridgeAgentConfiguration.getInstance().getCartridgeKey();
SecretKey key;
@@ -71,16 +71,17 @@ public class CartridgeAgentUtils {
byte[] decrypted = cipher.doFinal(encrypted);
decryptPassword = new String(decrypted);
} catch (Exception e) {
- log.error("An error has occurred", e);
+ log.error("An error has occurred", e);
+ }
+ if (log.isDebugEnabled()) {
+ log.debug("Decrypted PWD : [" + decryptPassword + "] ");
}
- if (log.isDebugEnabled()) {
- log.debug("Decrypted PWD : [" + decryptPassword + "] ");
- }
return decryptPassword;
}
/**
* Blocks until the provided ports are activated on the provided ip address or the port check timeout exceeds
+ *
* @param ipAddress
* @param ports
* @return true if ports are activated, false if timeout exceeded
@@ -98,10 +99,10 @@ public class CartridgeAgentUtils {
long startTime = System.currentTimeMillis();
boolean active = false;
while (!active) {
- if(log.isInfoEnabled()) {
- log.info("Waiting for ports to be active: [ip] "+ipAddress+" [ports] "+ports);
+ if (log.isInfoEnabled()) {
+ log.info("Waiting for ports to be active: [ip] " + ipAddress + " [ports] " + ports);
}
- active = checkPortsActive(ipAddress, ports);
+ active = checkPortsActive(ipAddress, ports);
long endTime = System.currentTimeMillis();
long duration = endTime - startTime;
if (duration > portCheckTimeOut) {
@@ -113,8 +114,8 @@ public class CartridgeAgentUtils {
}
}
- if(log.isInfoEnabled()) {
- log.info("Ports activated: [ip] " + ipAddress + " [ports] "+ports);
+ if (log.isInfoEnabled()) {
+ log.info("Ports activated: [ip] " + ipAddress + " [ports] " + ports);
}
return true;
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/util/ExtensionUtils.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/util/ExtensionUtils.java b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/util/ExtensionUtils.java
index ff7ee60..26bee82 100644
--- a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/util/ExtensionUtils.java
+++ b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/util/ExtensionUtils.java
@@ -62,7 +62,7 @@ public class ExtensionUtils {
throw new FileNotFoundException("Script file not found:" + filePath);
}
- public static void addPayloadParameters(Map<String, String> envParameters){
+ public static void addPayloadParameters(Map<String, String> envParameters) {
envParameters.put("STRATOS_APP_PATH", CartridgeAgentConfiguration.getInstance().getAppPath());
envParameters.put("STRATOS_PARAM_FILE_PATH", System.getProperty(CartridgeAgentConstants.PARAM_FILE_PATH));
envParameters.put("STRATOS_SERVICE_NAME", CartridgeAgentConfiguration.getInstance().getServiceName());
@@ -80,18 +80,18 @@ public class ExtensionUtils {
String[] memberIps = getLbMemberIp(lbClusterIdInPayload);
String lbIp, lbPublicIp;
if (memberIps != null && memberIps.length > 1) {
- lbIp = memberIps[0];
- lbPublicIp = memberIps[1];
+ lbIp = memberIps[0];
+ lbPublicIp = memberIps[1];
} else {
- lbIp = CartridgeAgentConfiguration.getInstance().getLbPrivateIp();
- lbPublicIp = CartridgeAgentConfiguration.getInstance().getLbPublicIp();
+ lbIp = CartridgeAgentConfiguration.getInstance().getLbPrivateIp();
+ lbPublicIp = CartridgeAgentConfiguration.getInstance().getLbPublicIp();
}
-
+
envParameters.put("STRATOS_LB_IP", lbIp);
envParameters.put("STRATOS_LB_PUBLIC_IP", lbPublicIp);
Topology topology = TopologyManager.getTopology();
- if (topology.isInitialized()){
+ if (topology.isInitialized()) {
Service service = topology.getService(CartridgeAgentConfiguration.getInstance().getServiceName());
Cluster cluster = service.getCluster(CartridgeAgentConfiguration.getInstance().getClusterId());
String memberIdInPayload = CartridgeAgentConfiguration.getInstance().getMemberId();
@@ -101,8 +101,8 @@ public class ExtensionUtils {
}
}
- public static void addProperties(Properties properties, Map<String, String> envParameters, String prefix){
- if (properties == null || properties.entrySet() == null){
+ public static void addProperties(Properties properties, Map<String, String> envParameters, String prefix) {
+ if (properties == null || properties.entrySet() == null) {
return;
}
for (Map.Entry<Object, Object> entry : properties.entrySet()) {
@@ -489,6 +489,7 @@ public class ExtensionUtils {
/**
* Check if the specified member is in the topology and is in MemberStatus.Initialized state
+ *
* @param serviceName
* @param clusterId
* @param memberId
@@ -501,7 +502,7 @@ public class ExtensionUtils {
if (activatedMember == null) {
if (log.isErrorEnabled()) {
//log.error(String.format("Member found in topology, but not in initialized state [member] %s", memberId));
- log.error(String.format("Member not found in topology [member] %s %s %s ", memberId, clusterId, serviceName));
+ log.error(String.format("Member not found in topology [member] %s %s %s ", memberId, clusterId, serviceName));
}
return false;
}
@@ -511,6 +512,7 @@ public class ExtensionUtils {
/**
* Gets the specified member from the topology
+ *
* @param serviceName
* @param clusterId
* @param memberId
http://git-wip-us.apache.org/repos/asf/stratos/blob/7519ffcd/components/org.apache.stratos.cartridge.agent/src/test/java/org/apache/stratos/cartridge/agent/test/JavaCartridgeAgentTest.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cartridge.agent/src/test/java/org/apache/stratos/cartridge/agent/test/JavaCartridgeAgentTest.java b/components/org.apache.stratos.cartridge.agent/src/test/java/org/apache/stratos/cartridge/agent/test/JavaCartridgeAgentTest.java
index 9e38656..3f0e73e 100644
--- a/components/org.apache.stratos.cartridge.agent/src/test/java/org/apache/stratos/cartridge/agent/test/JavaCartridgeAgentTest.java
+++ b/components/org.apache.stratos.cartridge.agent/src/test/java/org/apache/stratos/cartridge/agent/test/JavaCartridgeAgentTest.java
@@ -94,7 +94,7 @@ public class JavaCartridgeAgentTest {
}
@BeforeClass
- public static void oneTimeSetUp(){
+ public static void oneTimeSetUp() {
System.setProperty("jndi.properties.dir", getResourcesFolderPath());
}
@@ -172,7 +172,7 @@ public class JavaCartridgeAgentTest {
try {
log.info("Deleting source checkout folder...");
FileUtils.deleteDirectory(new File("/tmp/test-jca-source"));
- } catch (Exception ignore){
+ } catch (Exception ignore) {
}
this.instanceStatusEventReceiver.terminate();
@@ -185,10 +185,11 @@ public class JavaCartridgeAgentTest {
/**
* This method returns a collection of {@link org.apache.stratos.messaging.event.instance.notifier.ArtifactUpdatedEvent}
* objects as parameters to the test
+ *
* @return
*/
@Parameterized.Parameters
- public static Collection getArtifactUpdatedEventsAsParams(){
+ public static Collection getArtifactUpdatedEventsAsParams() {
ArtifactUpdatedEvent publicRepoEvent = createTestArtifactUpdatedEvent();
ArtifactUpdatedEvent privateRepoEvent = createTestArtifactUpdatedEvent();
@@ -212,6 +213,7 @@ public class JavaCartridgeAgentTest {
/**
* Creates an {@link org.apache.stratos.messaging.event.instance.notifier.ArtifactUpdatedEvent} object with a public
* repository URL
+ *
* @return
*/
private static ArtifactUpdatedEvent createTestArtifactUpdatedEvent() {
@@ -224,6 +226,7 @@ public class JavaCartridgeAgentTest {
/**
* Setup the JCA test path, copy test configurations
+ *
* @return
*/
private String setupJavaAgent() {
@@ -273,7 +276,7 @@ public class JavaCartridgeAgentTest {
log.info("Changing extension scripts permissions");
File extensionsPath = new File(agentHome.getCanonicalPath() + "/extensions/");
File[] extensions = extensionsPath.listFiles();
- for (File extension:extensions){
+ for (File extension : extensions) {
extension.setExecutable(true);
}
log.info("Changed permissions for extensions : " + outputStream);
@@ -294,6 +297,7 @@ public class JavaCartridgeAgentTest {
/**
* Get current folder path
+ *
* @return
*/
private static String getResourcesFolderPath() {
@@ -352,7 +356,7 @@ public class JavaCartridgeAgentTest {
communicatorThread.start();
- while (!instanceActivated){
+ while (!instanceActivated) {
sleep(2000);
}
@@ -362,6 +366,7 @@ public class JavaCartridgeAgentTest {
/**
* Publish messaging event
+ *
* @param event
*/
private void publishEvent(Event event) {
@@ -372,6 +377,7 @@ public class JavaCartridgeAgentTest {
/**
* Start server socket
+ *
* @param port
*/
private void startServerSocket(final int port) {
[3/3] stratos git commit: Organizing imports of cartridge agent module
Posted by la...@apache.org.
Organizing imports of 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/1034ba10
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/1034ba10
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/1034ba10
Branch: refs/heads/master
Commit: 1034ba10abe8b9bbee69daf035ee035e56e4f198
Parents: 7519ffc
Author: Lahiru Sandaruwan <la...@apache.org>
Authored: Sun Apr 12 18:30:27 2015 +0530
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Sun Apr 12 18:30:27 2015 +0530
----------------------------------------------------------------------
.../stratos/cartridge/agent/CartridgeAgent.java | 1 -
.../agent/CartridgeAgentEventListeners.java | 2 +-
.../git/impl/GitBasedArtifactRepository.java | 2 +-
.../data/publisher/log/LogPublisherManager.java | 14 +++++++-------
.../agent/extensions/DefaultExtensionHandler.java | 16 ++++++++++------
.../agent/extensions/ExtensionHandler.java | 6 +++---
.../publisher/HealthStatisticsReader.java | 1 -
.../agent/statistics/publisher/PluginLoader.java | 12 ++++++------
.../cartridge/agent/util/ExtensionUtils.java | 5 ++++-
9 files changed, 32 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/1034ba10/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 436028b..91f596e 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
@@ -33,7 +33,6 @@ import org.apache.stratos.cartridge.agent.extensions.ExtensionHandler;
import org.apache.stratos.cartridge.agent.util.CartridgeAgentConstants;
import org.apache.stratos.cartridge.agent.util.ExtensionUtils;
-
import java.util.List;
/**
http://git-wip-us.apache.org/repos/asf/stratos/blob/1034ba10/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 6192e6b..431e6b1 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
@@ -1,7 +1,7 @@
package org.apache.stratos.cartridge.agent;
-import org.apache.commons.logging.LogFactory;
import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.stratos.cartridge.agent.config.CartridgeAgentConfiguration;
import org.apache.stratos.cartridge.agent.extensions.DefaultExtensionHandler;
import org.apache.stratos.cartridge.agent.extensions.ExtensionHandler;
http://git-wip-us.apache.org/repos/asf/stratos/blob/1034ba10/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 9fe3818..957748f 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
@@ -19,6 +19,7 @@
package org.apache.stratos.cartridge.agent.artifact.deployment.synchronizer.git.impl;
+import org.apache.commons.io.FileUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.stratos.cartridge.agent.CartridgeAgent;
@@ -39,7 +40,6 @@ import org.eclipse.jgit.lib.StoredConfig;
import org.eclipse.jgit.storage.file.FileRepository;
import org.eclipse.jgit.transport.SshSessionFactory;
import org.eclipse.jgit.transport.UsernamePasswordCredentialsProvider;
-import org.apache.commons.io.*;
import java.io.File;
import java.io.IOException;
http://git-wip-us.apache.org/repos/asf/stratos/blob/1034ba10/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 a661c85..6a99368 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
@@ -19,13 +19,6 @@
package org.apache.stratos.cartridge.agent.data.publisher.log;
-import java.io.File;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.stratos.cartridge.agent.config.CartridgeAgentConfiguration;
@@ -38,6 +31,13 @@ import org.wso2.carbon.databridge.commons.AttributeType;
import org.wso2.carbon.databridge.commons.StreamDefinition;
import org.wso2.carbon.databridge.commons.exception.MalformedStreamDefinitionException;
+import java.io.File;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
public class LogPublisherManager {
private static final Log log = LogFactory.getLog(LogPublisherManager.class);
http://git-wip-us.apache.org/repos/asf/stratos/blob/1034ba10/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/extensions/DefaultExtensionHandler.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/extensions/DefaultExtensionHandler.java b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/extensions/DefaultExtensionHandler.java
index 8f52bd4..fa0858e 100644
--- a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/extensions/DefaultExtensionHandler.java
+++ b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/extensions/DefaultExtensionHandler.java
@@ -21,7 +21,6 @@ package org.apache.stratos.cartridge.agent.extensions;
import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
-
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -33,21 +32,26 @@ import org.apache.stratos.cartridge.agent.util.CartridgeAgentConstants;
import org.apache.stratos.cartridge.agent.util.CartridgeAgentUtils;
import org.apache.stratos.cartridge.agent.util.ExtensionUtils;
import org.apache.stratos.messaging.domain.tenant.Tenant;
-import org.apache.stratos.messaging.domain.topology.*;
+import org.apache.stratos.messaging.domain.topology.Cluster;
+import org.apache.stratos.messaging.domain.topology.Member;
+import org.apache.stratos.messaging.domain.topology.Service;
+import org.apache.stratos.messaging.domain.topology.Topology;
+import org.apache.stratos.messaging.event.application.signup.ApplicationSignUpRemovedEvent;
+import org.apache.stratos.messaging.event.domain.mapping.DomainMappingAddedEvent;
+import org.apache.stratos.messaging.event.domain.mapping.DomainMappingRemovedEvent;
import org.apache.stratos.messaging.event.instance.notifier.ArtifactUpdatedEvent;
import org.apache.stratos.messaging.event.instance.notifier.InstanceCleanupClusterEvent;
import org.apache.stratos.messaging.event.instance.notifier.InstanceCleanupMemberEvent;
import org.apache.stratos.messaging.event.tenant.CompleteTenantEvent;
-import org.apache.stratos.messaging.event.application.signup.ApplicationSignUpRemovedEvent;
-import org.apache.stratos.messaging.event.domain.mapping.DomainMappingAddedEvent;
-import org.apache.stratos.messaging.event.domain.mapping.DomainMappingRemovedEvent;
import org.apache.stratos.messaging.event.tenant.TenantSubscribedEvent;
import org.apache.stratos.messaging.event.tenant.TenantUnSubscribedEvent;
import org.apache.stratos.messaging.event.topology.*;
import org.apache.stratos.messaging.message.receiver.tenant.TenantManager;
import java.lang.reflect.Type;
-import java.util.*;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
public class DefaultExtensionHandler implements ExtensionHandler {
http://git-wip-us.apache.org/repos/asf/stratos/blob/1034ba10/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/extensions/ExtensionHandler.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/extensions/ExtensionHandler.java b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/extensions/ExtensionHandler.java
index 5e3641d..9dde074 100644
--- a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/extensions/ExtensionHandler.java
+++ b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/extensions/ExtensionHandler.java
@@ -19,13 +19,13 @@
package org.apache.stratos.cartridge.agent.extensions;
+import org.apache.stratos.messaging.event.application.signup.ApplicationSignUpRemovedEvent;
+import org.apache.stratos.messaging.event.domain.mapping.DomainMappingAddedEvent;
+import org.apache.stratos.messaging.event.domain.mapping.DomainMappingRemovedEvent;
import org.apache.stratos.messaging.event.instance.notifier.ArtifactUpdatedEvent;
import org.apache.stratos.messaging.event.instance.notifier.InstanceCleanupClusterEvent;
import org.apache.stratos.messaging.event.instance.notifier.InstanceCleanupMemberEvent;
import org.apache.stratos.messaging.event.tenant.CompleteTenantEvent;
-import org.apache.stratos.messaging.event.application.signup.ApplicationSignUpRemovedEvent;
-import org.apache.stratos.messaging.event.domain.mapping.DomainMappingAddedEvent;
-import org.apache.stratos.messaging.event.domain.mapping.DomainMappingRemovedEvent;
import org.apache.stratos.messaging.event.tenant.TenantSubscribedEvent;
import org.apache.stratos.messaging.event.tenant.TenantUnSubscribedEvent;
import org.apache.stratos.messaging.event.topology.*;
http://git-wip-us.apache.org/repos/asf/stratos/blob/1034ba10/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/statistics/publisher/HealthStatisticsReader.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/statistics/publisher/HealthStatisticsReader.java b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/statistics/publisher/HealthStatisticsReader.java
index b6f4e68..0f83f66 100644
--- a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/statistics/publisher/HealthStatisticsReader.java
+++ b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/statistics/publisher/HealthStatisticsReader.java
@@ -20,7 +20,6 @@
package org.apache.stratos.cartridge.agent.statistics.publisher;
import com.sun.management.OperatingSystemMXBean;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.stratos.cartridge.agent.config.CartridgeAgentConfiguration;
http://git-wip-us.apache.org/repos/asf/stratos/blob/1034ba10/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/statistics/publisher/PluginLoader.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/statistics/publisher/PluginLoader.java b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/statistics/publisher/PluginLoader.java
index a326c5e..0682225 100644
--- a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/statistics/publisher/PluginLoader.java
+++ b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/statistics/publisher/PluginLoader.java
@@ -1,18 +1,18 @@
package org.apache.stratos.cartridge.agent.statistics.publisher;
-import org.apache.commons.logging.LogFactory;
import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
-import java.io.IOException;
import java.io.File;
-import java.io.FileFilter;
+import java.io.IOException;
import java.net.URL;
import java.net.URLClassLoader;
import java.util.Enumeration;
-import java.util.List;
import java.util.LinkedList;
-import java.util.jar.*;
-import java.util.zip.*;
+import java.util.List;
+import java.util.jar.JarEntry;
+import java.util.jar.JarFile;
+import java.util.zip.ZipEntry;
public class PluginLoader {
http://git-wip-us.apache.org/repos/asf/stratos/blob/1034ba10/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/util/ExtensionUtils.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/util/ExtensionUtils.java b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/util/ExtensionUtils.java
index 26bee82..66612e8 100644
--- a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/util/ExtensionUtils.java
+++ b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/util/ExtensionUtils.java
@@ -24,7 +24,10 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.stratos.cartridge.agent.config.CartridgeAgentConfiguration;
import org.apache.stratos.common.util.CommandUtils;
-import org.apache.stratos.messaging.domain.topology.*;
+import org.apache.stratos.messaging.domain.topology.Cluster;
+import org.apache.stratos.messaging.domain.topology.Member;
+import org.apache.stratos.messaging.domain.topology.Service;
+import org.apache.stratos.messaging.domain.topology.Topology;
import org.apache.stratos.messaging.message.receiver.topology.TopologyManager;
import java.io.File;
[2/3] stratos git commit: Formatting cartridge agent module
Posted by la...@apache.org.
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;
+ }
}