Changeset 2534

Timestamp:

Jun 30, 2014, 9:07:21 AM (9 years ago)

Author:

Nicklas Nordborg

Message:

References #533 and BASE ticket ​http://base.thep.lu.se/ticket/1824. Call Services.restart() so that the BASE core can catch any exceptions.

Location:

extensions/net.sf.basedb.reggie/trunk/src/net/sf/basedb/reggie/grid

Files:

• OpenGridService.java (modified) (5 diffs)
• OpenGridServiceFactory.java (modified) (4 diffs)

extensions/net.sf.basedb.reggie/trunk/src/net/sf/basedb/reggie/grid/OpenGridService.java

@@ -15 +15 @@
 import org.slf4j.LoggerFactory;
 
+import net.sf.basedb.clients.web.extensions.service.Services;
 import net.sf.basedb.core.Application;
 import net.sf.basedb.core.ConfigurationException;
@@ -22 +23 @@
 import net.sf.basedb.core.User;
 import net.sf.basedb.util.XMLUtil;
+import net.sf.basedb.util.extensions.Extension;
 
 /**
@@ -65 +67 @@
   }
 
-  static final OpenGridService getInstance(SessionControl sc)
+  static final OpenGridService getInstance(SessionControl sc, Extension ext)
   {
     OpenGridService srv = getInstance();
     srv.sc = sc;
+    srv.ext = ext;
     return srv;
   }
@@ -74 +77 @@
   private volatile boolean isRunning;
   private SessionControl sc;
+  private Extension ext;
   private Map<String, OpenGridCluster> clusters;
   private TimerTask jobStatusTimer;
@@ -137 +141 @@
   public synchronized void restart()
   {
-    stop();
-    start();
+    Services.restart(ext);
   }
   

extensions/net.sf.basedb.reggie/trunk/src/net/sf/basedb/reggie/grid/OpenGridServiceFactory.java

@@ -4 +4 @@
 import net.sf.basedb.core.SessionControl;
 import net.sf.basedb.util.extensions.ActionFactory;
+import net.sf.basedb.util.extensions.Extension;
 import net.sf.basedb.util.extensions.InvokationContext;
 
@@ -36 +37 @@
   {
     SessionControl sc = context.getClientContext().getSessionControl();
-    return new ServiceControllerAction[] { new OpenGridServiceControllerAction(sc) };
+    return new ServiceControllerAction[] { new OpenGridServiceControllerAction(sc, context.getExtension()) };
   }
   // ---------------------------------------------
@@ -44 +45 @@
   {
     private final SessionControl sc;
+    private final Extension ext;
     
-    OpenGridServiceControllerAction(SessionControl sc)
+    OpenGridServiceControllerAction(SessionControl sc, Extension ext)
     {
       this.sc = sc;
+      this.ext = ext;
     }
     
@@ -63 +66 @@
     public void start() 
     {
-      OpenGridService.getInstance(sc).start();
+      OpenGridService.getInstance(sc, ext).start();
     }