X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=auth%2Fauth-batch%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faaf%2Fauth%2Fbatch%2FBatch.java;h=983ef819f76dffd14dffb2de03b427f3e43acd19;hb=083a7eb21620467ae1f7d5ba9341e12f75f9cc41;hp=d2695a3531db903b43358c5c53c9ae425d30d957;hpb=82865bf0ee1e3258751542b6af682fcd851fbc71;p=aaf%2Fauthz.git

diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/Batch.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/Batch.java
index d2695a35..983ef819 100644
--- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/Batch.java
+++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/Batch.java
@@ -55,7 +55,6 @@ import org.onap.aaf.cadi.PropAccess;
 import org.onap.aaf.cadi.config.Config;
 import org.onap.aaf.misc.env.APIException;
 import org.onap.aaf.misc.env.Env;
-import org.onap.aaf.misc.env.StaticSlot;
 import org.onap.aaf.misc.env.TimeTaken;
 import org.onap.aaf.misc.env.util.Chrono;
 import org.onap.aaf.misc.env.util.Split;
@@ -68,9 +67,6 @@ import com.datastax.driver.core.Session;
 import com.datastax.driver.core.Statement;
 
 public abstract class Batch {
-
-    private static StaticSlot ssargs;
-
     protected static final String STARS = "*****";
 
     protected static Cluster cluster;
@@ -83,6 +79,8 @@ public abstract class Batch {
 
     private static File logdir;
 
+	private static String[] batchArgs;
+
     public static final String CASS_ENV = "CASS_ENV";
     public static final String LOG_DIR = "LOG_DIR";
     protected static final String MAX_EMAILS="MAX_EMAILS";
@@ -157,7 +155,7 @@ public abstract class Batch {
     protected void _close(AuthzTrans trans) {}
 
     public String[] args() {
-        return env.get(ssargs);
+        return batchArgs;
     }
 
     public boolean isDryRun()
@@ -380,11 +378,12 @@ public abstract class Batch {
         // Use a StringBuilder to save off logs until a File can be setup
         StringBuilderOutputStream sbos = new StringBuilderOutputStream();
         PropAccess access = new PropAccess(new PrintStream(sbos),args);
-        access.log(Level.INIT, "------- Starting Batch ------\n  Args: ");
+        access.log(Level.INFO, "------- Starting Batch ------\n  Args: ");
         for(String s: args) {
             sbos.getBuffer().append(s);
             sbos.getBuffer().append(' ');
         }
+        sbos.getBuffer().append('\n');
 
         InputStream is = null;
         String filename;
@@ -454,13 +453,10 @@ public abstract class Batch {
                         len -= 1;
                         if (len < 0)
                             len = 0;
-                        String nargs[] = new String[len];
+                        batchArgs = new String[len];
                         if (len > 0) {
-                            System.arraycopy(args, 1, nargs, 0, len);
+                            System.arraycopy(args, 1, batchArgs, 0, len);
                         }
-
-                        env.put(ssargs = env.staticSlot("ARGS"), nargs);
-
                         /*
                          * Add New Batch Programs (inherit from Batch) here
                          */
@@ -521,6 +517,7 @@ public abstract class Batch {
                         try {
                             batch.run(trans);
                         } catch (Exception e) {
+                        	trans.error().log(e);
                             if(cluster!=null && !cluster.isClosed()) {
                                 cluster.close();
                             }
@@ -536,6 +533,8 @@ public abstract class Batch {
                     trans.auditTrail(4, sb, AuthzTrans.SUB, AuthzTrans.REMOTE);
                     trans.info().log(sb);
                 }
+            } catch (Exception e) {
+            	env.warn().log(e);
             } finally {
                 batchLog.close();
             }