Fixes/Refinements from Testing

[aaf/authz.git] / auth / auth-core / src / main / java / org / onap / aaf / auth / server / AbsServiceStarter.java

diff --git a/auth/auth-core/src/main/java/org/onap/aaf/auth/server/AbsServiceStarter.java b/auth/auth-core/src/main/java/org/onap/aaf/auth/server/AbsServiceStarter.java
index f14d6c3..f583113 100644 (file)
--- a/auth/auth-core/src/main/java/org/onap/aaf/auth/server/AbsServiceStarter.java
+++ b/auth/auth-core/src/main/java/org/onap/aaf/auth/server/AbsServiceStarter.java
@@ -19,10 +19,20 @@
  *
  */
 package org.onap.aaf.auth.server;
+import java.io.File;
+import java.io.IOException;
+import java.net.Inet4Address;
+import java.net.UnknownHostException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+
 import org.onap.aaf.auth.org.OrganizationException;
 import org.onap.aaf.auth.org.OrganizationFactory;
 import org.onap.aaf.auth.rserv.RServlet;
 import org.onap.aaf.cadi.Access;
+import org.onap.aaf.cadi.Access.Level;
+import org.onap.aaf.cadi.config.Config;
 import org.onap.aaf.cadi.register.Registrant;
 import org.onap.aaf.cadi.register.Registrar;
 import org.onap.aaf.misc.env.Trans;
@@ -32,24 +42,36 @@ public abstract class AbsServiceStarter<ENV extends RosettaEnv, TRANS extends Tr
     private Registrar<ENV> registrar;
     private boolean do_register;
     protected AbsService<ENV,TRANS> service;
+       protected String hostname;
+       protected final boolean secure;
 
 
-    public AbsServiceStarter(final AbsService<ENV,TRANS> service) {
+    public AbsServiceStarter(final AbsService<ENV,TRANS> service, boolean secure) {
+       this.secure = secure;
         this.service = service;
         try {
             OrganizationFactory.init(service.env);
         } catch (OrganizationException e) {
-            service.access.log(e, "Missing defined Organzation Plugins");
-            System.exit(3);
+            service.access.log(e, "Missing defined Organization Plugins");
+               System.exit(3);
         }
         // do_register - this is used for specialty Debug Situations.  Developer can create an Instance for a remote system
         // for Debugging purposes without fear that real clients will start to call your debug instance
         do_register = !"TRUE".equalsIgnoreCase(access().getProperty("aaf_locate_no_register",null));
+        hostname = access().getProperty(Config.HOSTNAME, null);
+        if (hostname==null) {
+            try {
+                               hostname = Inet4Address.getLocalHost().getHostName();
+                       } catch (UnknownHostException e) {
+                               hostname= "cannotBeDetermined";
+                       }
+        }
         _propertyAdjustment();
     }
     
-    public abstract void _start(RServlet<TRANS> rserv) throws Exception;
-    public abstract void _propertyAdjustment();
+    
+    protected abstract void _start(RServlet<TRANS> rserv) throws Exception;
+    protected abstract void _propertyAdjustment();
     
     public ENV env() {
         return service.env;
@@ -61,35 +83,83 @@ public abstract class AbsServiceStarter<ENV extends RosettaEnv, TRANS extends Tr
 
     @Override
     public final void start() throws Exception {
-        _start(service);
-        Runtime.getRuntime().addShutdownHook(new Thread() {
-            @Override
-            public void run() {
-                shutdown();
-            }
-        });
+       ExecutorService es = Executors.newSingleThreadExecutor();
+       Future<?> app = es.submit(this);
+        final AbsServiceStarter<?,?> absSS = this;
+        // Docker/K8 may separately create startup Status in this dir for startup 
+        // sequencing.  If so, delete ON EXIT 
+       Runtime.getRuntime().addShutdownHook(new Thread() {
+             @Override
+          public void run() {
+                 absSS.access().printf(Level.INIT, "Shutting down %s:%s\n",absSS.service.app_name, absSS.service.app_version);
+                 absSS.shutdown();
+                 app.cancel(true);
+             }
+       });
+               if(System.getProperty("ECLIPSE", null)!=null) {
+                       Thread.sleep(2000);
+                       if(!app.isCancelled()) {
+                       System.out.println("Service Started in Eclipse: ");
+                       System.out.print("  Hit <enter> to end:\n");
+                       try {
+                                       System.in.read();
+                                       System.exit(0);
+                               } catch (IOException e) {
+                               }
+                       }
+               }
     }
-
+    
     @SafeVarargs
     public final synchronized void register(final Registrant<ENV> ... registrants) {
-        if(do_register) {
-            if(registrar==null) {
+        if (do_register) {
+            if (registrar==null) {
                 registrar = new Registrar<ENV>(env(),false);
             }
-            for(Registrant<ENV> r : registrants) {
+            for (Registrant<ENV> r : registrants) {
                 registrar.register(r);
             }
         }
     }
 
     @Override
+       public void run() {
+        try {
+                       _start(service);
+               } catch (Exception e) {
+                       e.printStackTrace();
+               }
+       }
+
+       @Override
     public void shutdown() {
-        if(registrar!=null) {
+        if (registrar!=null) {
             registrar.close(env());
             registrar=null;
         } 
-        if(service!=null) {
-            service.destroy();
+        if (service!=null) {
+            File status = new File("/opt/app/aaf/status/");
+            boolean deleted = false;
+               if(status.exists()) {
+                       int lastdot = service.app_name.lastIndexOf("aaf.");
+                       String fname;
+                       if(lastdot<0) {
+                               fname = service.app_name + '-' + hostname;
+                       } else {
+                               fname = service.app_name.substring(lastdot).replace('.', '-') 
+                                               + '-' + hostname;
+                       }
+                       status = new File(status, fname);
+                       if(status.exists()) {
+                               deleted=status.delete();
+                       }
+               }
+               if(deleted) {
+                       service.access.log(Level.INIT, "Deleted Status",status.getAbsolutePath());
+               } else {
+                       service.access.log(Level.INIT, "Status not deleted: ",status.getAbsolutePath());
+               }
+               service.destroy();
         }
     }
 }