midsuit
/
core-jgi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

IDEMPIERE-4590 Scheduler Window: Start Scheduler action change AD_Client_ID to 0 when HazelCast Service is Down/Disable (#449)

This commit is contained in:
hengsin 2020-12-10 18:54:39 +08:00 committed by GitHub
parent 6e380b3dfb
commit e017046dac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
org.adempiere.server/src/main/server/org/compiere/server/AdempiereServerMgr.java
View File

@ -31,6 +31,7 @@ import org.adempiere.base.Core;
import org.adempiere.base.Service; import org.adempiere.base.Service;
import org.adempiere.server.AdempiereServerActivator; import org.adempiere.server.AdempiereServerActivator;
import org.adempiere.server.IServerFactory; import org.adempiere.server.IServerFactory;
import org.adempiere.util.ServerContext;
import org.compiere.Adempiere; import org.compiere.Adempiere;
import org.compiere.model.AdempiereProcessor; import org.compiere.model.AdempiereProcessor;
import org.compiere.model.MScheduler; import org.compiere.model.MScheduler;
@ -344,16 +345,23 @@ public class AdempiereServerMgr implements ServiceTrackerCustomizer<IServerFacto
{ {
log.info (""); log.info ("");
LocalServerController[] servers = getInActive(); LocalServerController[] servers = getInActive();
Properties currentContext = ServerContext.getCurrentInstance();
for (int i = 0; i < servers.length; i++) for (int i = 0; i < servers.length; i++)
{ {
LocalServerController server = servers[i]; LocalServerController server = servers[i];
Properties temp = null;
try try
{ {
if (server.scheduleFuture != null && !server.scheduleFuture.isDone()) if (server.scheduleFuture != null && !server.scheduleFuture.isDone())
continue; continue;
// Do start // Do start
// replace // replace
Env.setContext(Env.getCtx(), Env.AD_CLIENT_ID, server.getServer().getModel().getAD_Client_ID()); if (Env.getAD_Client_ID(currentContext) != server.getServer().getModel().getAD_Client_ID())
{
temp = new Properties(currentContext);
Env.setContext(temp, Env.AD_CLIENT_ID, server.getServer().getModel().getAD_Client_ID());
ServerContext.setCurrentInstance(temp);
}
server.getServer().recalculateSleepMS(); server.getServer().recalculateSleepMS();
server.start(); server.start();
} }
@ -361,8 +369,12 @@ public class AdempiereServerMgr implements ServiceTrackerCustomizer<IServerFacto
{ {
log.log(Level.SEVERE, "Server: " + server, e); log.log(Level.SEVERE, "Server: " + server, e);
} }
finally
{
if (temp != null)
ServerContext.setCurrentInstance(currentContext);
}
} // for all servers } // for all servers
Env.setContext(Env.getCtx(), Env.AD_CLIENT_ID, 0);
// Final Check // Final Check
int noRunning = 0; int noRunning = 0;
@ -407,10 +419,17 @@ public class AdempiereServerMgr implements ServiceTrackerCustomizer<IServerFacto
if (server.scheduleFuture != null && !server.scheduleFuture.isDone()) if (server.scheduleFuture != null && !server.scheduleFuture.isDone())
return "Server is already running"; return "Server is already running";
Properties currentContext = ServerContext.getCurrentInstance();
Properties temp = null;
try try
{ {
// replace // replace
Env.setContext(Env.getCtx(), Env.AD_CLIENT_ID, server.getServer().getModel().getAD_Client_ID()); if (Env.getAD_Client_ID(currentContext) != server.getServer().getModel().getAD_Client_ID())
{
temp = new Properties(currentContext);
Env.setContext(temp, Env.AD_CLIENT_ID, server.getServer().getModel().getAD_Client_ID());
ServerContext.setCurrentInstance(temp);
}
server.getServer().recalculateSleepMS(); server.getServer().recalculateSleepMS();
server.start(); server.start();
} }
@ -421,7 +440,8 @@ public class AdempiereServerMgr implements ServiceTrackerCustomizer<IServerFacto
} }
finally finally
{ {
Env.setContext(Env.getCtx(), Env.AD_CLIENT_ID, 0); if (temp != null)
ServerContext.setCurrentInstance(currentContext);
} }
if (log.isLoggable(Level.INFO)) log.info(server.toString()); if (log.isLoggable(Level.INFO)) log.info(server.toString());
return (server.scheduleFuture != null && !server.scheduleFuture.isDone()) ? null : "Failed to start server"; return (server.scheduleFuture != null && !server.scheduleFuture.isDone()) ? null : "Failed to start server";

2
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/scheduler/SchedulerStateEditor.java
View File

@ -332,7 +332,7 @@ public class SchedulerStateEditor extends WEditor {
schedulerState=0; schedulerState=0;
MScheduler scheduler = new MScheduler(Env.getCtx(), getAD_Scheduler_ID(), null); MScheduler scheduler = new MScheduler(Env.getCtx(), getAD_Scheduler_ID(), null);
IServerManager serverMgr = getServerMgr(); IServerManager serverMgr = getServerMgr();
schedulerState = serverMgr.getServerStatus(scheduler.getServerID()); schedulerState = serverMgr != null ? serverMgr.getServerStatus(scheduler.getServerID()) : -1;
String label = null; String label = null;
if (schedulerState == IServerManager.SERVER_STATE_NOT_SCHEDULE) if (schedulerState == IServerManager.SERVER_STATE_NOT_SCHEDULE)
label = Msg.getMsg(Env.getCtx(), "SchedulerNotSchedule"); label = Msg.getMsg(Env.getCtx(), "SchedulerNotSchedule");