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

IDEMPIERE-2516 iDempiere monitor shows inactive clients (maintenance mode / active sessions) / thanks to Nicolas Micoud (nmicoud)

This commit is contained in:
Carlos Ruiz 2015-03-18 14:55:04 -05:00
parent d3d194f80d
commit e8723e62e0
3 changed files with 48 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
org.adempiere.base/src/org/compiere/model/MClient.java
View File

@ -56,7 +56,7 @@ public class MClient extends X_AD_Client
/** /**
* *
*/ */
private static final long serialVersionUID = -4479164806149932775L; private static final long serialVersionUID = -4420908648355523008L;
/** /**
* Get client * Get client
@ -81,8 +81,20 @@ public class MClient extends X_AD_Client
* @return clients * @return clients
*/ */
public static MClient[] getAll (Properties ctx) public static MClient[] getAll (Properties ctx)
{
return getAll(ctx, "");
} // getAll
/**
* Get all clients
* @param ctx context
* @param order by clause
* @return clients
*/
public static MClient[] getAll (Properties ctx, String orderBy)
{ {
List<MClient> list = new Query(ctx,I_AD_Client.Table_Name,null,null) List<MClient> list = new Query(ctx,I_AD_Client.Table_Name,null,null)
.setOrderBy(orderBy)
.list(); .list();
for(MClient client:list ){ for(MClient client:list ){
s_cache.put (new Integer (client.getAD_Client_ID()), client); s_cache.put (new Integer (client.getAD_Client_ID()), client);

4
org.adempiere.base/src/org/compiere/util/Login.java
View File

@ -771,7 +771,9 @@ public class Login
// IDEMPIERE-1717 Maintenance mode // IDEMPIERE-1717 Maintenance mode
if (! MRole.get(m_ctx, AD_Role_ID).isAccessAdvanced()) { if (! MRole.get(m_ctx, AD_Role_ID).isAccessAdvanced()) {
if (MSysConfig.getBooleanValue(MSysConfig.SYSTEM_IN_MAINTENANCE_MODE, false, AD_Client_ID)) if (MSysConfig.getBooleanValue(MSysConfig.SYSTEM_IN_MAINTENANCE_MODE, false, 0))
return Msg.getMsg(m_ctx, "SystemInMaintenance");
if (AD_Client_ID != 0 && MSysConfig.getBooleanValue(MSysConfig.SYSTEM_IN_MAINTENANCE_MODE, false, AD_Client_ID))
return Msg.getMsg(m_ctx, "SystemInMaintenance"); return Msg.getMsg(m_ctx, "SystemInMaintenance");
} }

48
org.adempiere.server/src/main/servlet/org/compiere/web/AdempiereMonitor.java
View File

@ -65,6 +65,7 @@ import org.compiere.model.AdempiereProcessorLog;
import org.compiere.model.MClient; import org.compiere.model.MClient;
import org.compiere.model.MSession; import org.compiere.model.MSession;
import org.compiere.model.MStore; import org.compiere.model.MStore;
import org.compiere.model.MSysConfig;
import org.compiere.model.MSystem; import org.compiere.model.MSystem;
import org.compiere.model.Query; import org.compiere.model.Query;
import org.compiere.server.AdempiereServerGroup; import org.compiere.server.AdempiereServerGroup;
@ -95,7 +96,8 @@ public class AdempiereMonitor extends HttpServlet
/** /**
* *
*/ */
private static final long serialVersionUID = -387582087015910664L; private static final long serialVersionUID = -7455613826465213838L;
/** Logger */ /** Logger */
private static CLogger log = CLogger.getCLogger(AdempiereMonitor.class); private static CLogger log = CLogger.getCLogger(AdempiereMonitor.class);
/** The Server */ /** The Server */
@ -1005,7 +1007,7 @@ public class AdempiereMonitor extends HttpServlet
table.setCellPadding(2); table.setCellPadding(2);
// //
line = new tr(); line = new tr();
MClient[] clients = MClient.getAll(ctx); MClient[] clients = MClient.getAll(ctx, "AD_Client_ID");
line.addElement(new th().addElement("Client #" + clients.length + " - EMail Test:")); line.addElement(new th().addElement("Client #" + clients.length + " - EMail Test:"));
p = new p(); p = new p();
for (int i = 0; i < clients.length; i++) for (int i = 0; i < clients.length; i++)
@ -1044,6 +1046,8 @@ public class AdempiereMonitor extends HttpServlet
p = new p(); p = new p();
for (int i = 0; i < clients.length; i++) { for (int i = 0; i < clients.length; i++) {
MClient client = clients[i]; MClient client = clients[i];
if (!client.isActive())
continue;
if (i > 0) if (i > 0)
p.addElement(" - "); p.addElement(" - ");
int count = 0; int count = 0;
@ -1059,20 +1063,34 @@ public class AdempiereMonitor extends HttpServlet
table.addElement(line); table.addElement(line);
// //
line = new tr(); line = new tr();
int inMaintenanceClients[] = DB.getIDsEx(null, "SELECT AD_Client_ID FROM AD_SysConfig WHERE Name = 'SYSTEM_IN_MAINTENANCE_MODE' AND Value = 'Y'");
line.addElement(new th().addElement("Maintenance Mode #"+inMaintenanceClients.length)); boolean isSystemInMaintenance = MSysConfig.getBooleanValue(MSysConfig.SYSTEM_IN_MAINTENANCE_MODE, false, 0);
p = new p(); List<Integer> inMaintenanceClients = new ArrayList<Integer>();
if (inMaintenanceClients.length > 0) { if (isSystemInMaintenance)
for (int i = 0; i < clients.length; i++) { line.addElement(new th().addElement("Maintenance Mode"));
MClient client = clients[i]; else {
if (i > 0) int possiblyInMaintenanceClients[] = DB.getIDsEx(null, "SELECT AD_Client_ID FROM AD_SysConfig WHERE AD_Client_ID!=0 AND IsActive='Y' AND Name=?", MSysConfig.SYSTEM_IN_MAINTENANCE_MODE);
p.addElement(" - "); for (int clientId : possiblyInMaintenanceClients) {
for (int clientID : inMaintenanceClients) { boolean isTenantInMaintenance = MSysConfig.getBooleanValue(MSysConfig.SYSTEM_IN_MAINTENANCE_MODE, false, clientId);
if (client.getAD_Client_ID() == clientID) if (isTenantInMaintenance)
p.addElement(client.getName() + " : Yes"); inMaintenanceClients.add(clientId);
else
p.addElement(client.getName() + " : No");
} }
line.addElement(new th().addElement("Maintenance Mode #"+inMaintenanceClients.size()));
}
p = new p();
if (isSystemInMaintenance)
p.addElement("All clients are in maintenance mode");
else if (inMaintenanceClients.size() > 0) {
boolean first = true;
for (int clientID : inMaintenanceClients) {
MClient client = MClient.get(ctx, clientID);
if (!client.isActive())
continue;
if (!first)
p.addElement(" - ");
p.addElement(client.getName());
first = false;
} }
} }
else else