diff options
Diffstat (limited to 'src/main/java/org/openecomp/dmaapbc/server/Main.java')
| -rw-r--r-- | src/main/java/org/openecomp/dmaapbc/server/Main.java | 76 |
1 files changed, 61 insertions, 15 deletions
diff --git a/src/main/java/org/openecomp/dmaapbc/server/Main.java b/src/main/java/org/openecomp/dmaapbc/server/Main.java index 2143670..11b6976 100644 --- a/src/main/java/org/openecomp/dmaapbc/server/Main.java +++ b/src/main/java/org/openecomp/dmaapbc/server/Main.java @@ -19,15 +19,24 @@ */
package org.openecomp.dmaapbc.server;
-
-import java.io.FileInputStream;
+import java.net.InetAddress;
import java.util.Properties;
-import org.apache.log4j.Logger;
-import org.apache.log4j.PropertyConfigurator;
+import java.util.UUID;
+
+import org.openecomp.dmaapbc.authentication.ApiPerms;
+import org.openecomp.dmaapbc.database.DatabaseClass;
+import org.openecomp.dmaapbc.model.Dmaap;
import org.openecomp.dmaapbc.util.DmaapConfig;
+import org.openecomp.dmaapbc.util.Singleton;
+import org.openecomp.dmaapbc.logging.*;
+
+
+import static com.att.eelf.configuration.Configuration.*;
+import org.slf4j.MDC;
+
+public class Main extends BaseLoggingClass {
-public class Main {
private Properties parameters;
private static String provFQDN;
@@ -44,24 +53,61 @@ public class Main { (new Main()).main();
}
- static final Logger logger = Logger.getLogger(Main.class);
private void main() {
- String log = System.getProperty( "log4j.configuration");
- if ( log.isEmpty() ) {
- log = "log4j.properties";
- }
- PropertyConfigurator.configure( log );
- logger.info("Started.");
+
+ MDC.clear();
+
+ MDC.put(MDC_SERVICE_INSTANCE_ID, "");
+ try {
+ MDC.put(MDC_SERVER_FQDN, InetAddress.getLocalHost().getHostName());
+ MDC.put(MDC_SERVER_IP_ADDRESS, InetAddress.getLocalHost().getHostAddress());
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ MDC.put(MDC_INSTANCE_UUID, UUID.randomUUID().toString());
+ MDC.put(MDC_ALERT_SEVERITY, "0");
+
+
+ MDC.put(MDC_TARGET_ENTITY, "DCAE");
+
+
+/*
+ String msg = "This is a sample {} message to demo EELF logging.";
+
+ appLogger.info( msg, "appLogger.info");
+
+ auditLogger.auditEvent( msg, "auditLogger.auditEvent");
+ errorLogger.error(DmaapbcLogMessageEnum.MESSAGE_SAMPLE_NOARGS);
+ errorLogger.error(DmaapbcLogMessageEnum.MESSAGE_SAMPLE_ONE_ARG, "errorLogger.error");
+ errorLogger.error(DmaapbcLogMessageEnum.MESSAGE_SAMPLE_TWO_ARGS, new Date().toString(), "errorLogger.error" );
+ metricsLogger.metricsEvent( msg, "metricsLogger.metricsEvent" );
+ debugLogger.debug( msg, "debugLogger.debug");
+
+ //String log = System.getProperty( "log4j.configuration");
+ //if ( log.isEmpty() ) {
+ // log = "log4j.properties";
+ //}
+ //PropertyConfigurator.configure( log );
+ *
+ */
+ appLogger.info("Started.");
parameters = DmaapConfig.getConfig();
setProvFQDN( parameters.getProperty("ProvFQDN", "ProvFQDN.notset.com"));
+
+
+ // for fresh installs, we may come up with no dmaap name so need to have a way for Controller to talk to us
+ Singleton<Dmaap> dmaapholder = DatabaseClass.getDmaap();
+ String name = dmaapholder.get().getDmaapName();
+ if ( name == null || name.isEmpty()) {
+ ApiPerms p = new ApiPerms();
+ p.setBootMap();
+ }
try {
- //new JettyServer( Integer.valueOf(parameters.getProperty("IntHttpPort", "80" )),
- // Integer.valueOf(parameters.getProperty("IntHttpsPort","443")));
new JettyServer( parameters );
} catch (Exception e) {
- logger.fatal("Unable to start Jetty " + DmaapConfig.getConfigFileName(), e);
+ errorLogger.error("Unable to start Jetty " + DmaapConfig.getConfigFileName(), e);
System.exit(1);
}
|