X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=aai-core%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faai%2Ftasks%2FScheduledTasks.java;h=64d67c0c1351bda30495cc8d5bb245eda04234d4;hb=fbb02159b84435cf37221ae8ae5e0045167be15a;hp=9d2e8b6818447b2e87cc6400647b0a523cb8fef0;hpb=1767960099ea2983eef5218b8ce44b167ae0774c;p=aai%2Faai-common.git

diff --git a/aai-core/src/main/java/org/onap/aai/tasks/ScheduledTasks.java b/aai-core/src/main/java/org/onap/aai/tasks/ScheduledTasks.java
index 9d2e8b68..64d67c0c 100644
--- a/aai-core/src/main/java/org/onap/aai/tasks/ScheduledTasks.java
+++ b/aai-core/src/main/java/org/onap/aai/tasks/ScheduledTasks.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * org.onap.aai
  * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,76 +16,70 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
+
 package org.onap.aai.tasks;
 
 import java.io.File;
 import java.util.Arrays;
 import java.util.Date;
-import java.util.UUID;
 
 import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.io.comparator.LastModifiedFileComparator;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Component;
-
-import org.onap.aai.logging.LoggingContext;
+import org.onap.aai.aailog.logs.AaiScheduledTaskAuditLog;
 import org.onap.aai.util.AAIConfig;
 import org.onap.aai.util.AAIConstants;
-import com.att.eelf.configuration.EELFLogger;
-import com.att.eelf.configuration.EELFManager;
+import org.onap.logging.filter.base.ONAPComponents;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
 
 @Component
 public class ScheduledTasks {
 
-	private static EELFLogger LOGGER = EELFManager.getInstance().getLogger(ScheduledTasks.class);
-
-	private static final String COMPONENT = "Scheduler";
-	private static final String FROM_APP_ID = "CronApp";
-	private static final long PROPERTY_READ_INTERVAL = 60000; // every minute
-
-	private String GlobalPropFileName = AAIConstants.AAI_CONFIG_FILENAME;
-
-	// for read and possibly reloading aaiconfig.properties and other
-	/**
-	 * Load AAI properties.
-	 */
-	// configuration properties files
-	@Scheduled(fixedRate = PROPERTY_READ_INTERVAL)
-	public void loadAAIProperties() {
-		final UUID transId = UUID.randomUUID();
+    @Autowired
+    private AaiScheduledTaskAuditLog auditLog;
 
-		LoggingContext.requestId(transId);
-		LoggingContext.partnerName(FROM_APP_ID);
-		LoggingContext.component(COMPONENT);
+    private static Logger LOGGER = LoggerFactory.getLogger(ScheduledTasks.class);
+    private static final long PROPERTY_READ_INTERVAL = 60000; // every minute
+    private String GlobalPropFileName = AAIConstants.AAI_CONFIG_FILENAME;
 
-		String dir = FilenameUtils.getFullPathNoEndSeparator(GlobalPropFileName);
-		if (dir == null || dir.length() < 3) {
-			dir = "/opt/aai/etc";
-		}
+    // for read and possibly reloading aaiconfig.properties and other
+    /**
+     * Load AAI properties.
+     */
+    // configuration properties files
+    @Scheduled(fixedRate = PROPERTY_READ_INTERVAL)
+    public void loadAAIProperties() {
+        auditLog.logBefore("LoadAaiPropertiesTask", ONAPComponents.AAI.toString());
+        String dir = FilenameUtils.getFullPathNoEndSeparator(GlobalPropFileName);
+        if (dir == null || dir.length() < 3) {
+            dir = "/opt/aai/etc";
+        }
 
-		File pdir = new File(dir);
-		File[] files = pdir.listFiles();
-		Arrays.sort(files, LastModifiedFileComparator.LASTMODIFIED_REVERSE);
-		String fn;
+        File pdir = new File(dir);
+        File[] files = pdir.listFiles();
+        Arrays.sort(files, LastModifiedFileComparator.LASTMODIFIED_REVERSE);
+        String fn;
 
-		// leave this loop here since we may want to check other configurable
-		// property files in the SAME directory
-		for (File file : files) {
-			fn = file.getName();
-			if (fn.equals("aaiconfig.properties")) {
-				Date lastMod = new Date(file.lastModified());
-				long lastModTm = lastMod.getTime();
-				Date curTS = new Date();
-				long curTSTm = curTS.getTime();
-				if (curTSTm - lastModTm < PROPERTY_READ_INTERVAL + 1000) {
-					AAIConfig.reloadConfig();
-					LOGGER.info("reloaded from aaiconfig.properties");
-				}
-				break;
-			}
-		}
-	}
+        // leave this loop here since we may want to check other configurable
+        // property files in the SAME directory
+        for (File file : files) {
+            fn = file.getName();
+            if (fn.equals("aaiconfig.properties")) {
+                Date lastMod = new Date(file.lastModified());
+                long lastModTm = lastMod.getTime();
+                Date curTS = new Date();
+                long curTSTm = curTS.getTime();
+                if (curTSTm - lastModTm < PROPERTY_READ_INTERVAL + 1000) {
+                    AAIConfig.reloadConfig();
+                    LOGGER.debug("reloaded from aaiconfig.properties");
+                }
+                break;
+            }
+        }
+        auditLog.logAfter();
+    }
 }