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

IDEMPIERE-656 ViewLog shows AppsServerOK=false in the the error tab of the about window.

This commit is contained in:
Heng Sin Low 2013-03-28 12:00:40 +08:00
parent ed5fcfd04a
commit cc0d7302cb
2 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
org.adempiere.base/src/org/compiere/db/CConnection.java
View File

@ -1108,9 +1108,17 @@ public class CConnection implements Serializable, Cloneable
{ {
StringBuilder sb = new StringBuilder (m_info[0] != null ? m_info[0] : ""); StringBuilder sb = new StringBuilder (m_info[0] != null ? m_info[0] : "");
sb.append (" - ").append (m_info[1] != null ? m_info[1] : "") sb.append (" - ").append (m_info[1] != null ? m_info[1] : "")
.append ("\n").append (getDatabase ().toString ()) .append ("\n").append (getDatabase ().toString ());
.append ("\nAppsServerOK=").append (isAppsServerOK (false))
.append (", DatabaseOK=").append (isDatabaseOK ()); if (Ini.isClient())
{
sb.append ("\nAppsServerOK=").append (isAppsServerOK (false))
.append (", DatabaseOK=").append (isDatabaseOK ());
}
else
{
sb.append ("\nDatabaseOK=").append (isDatabaseOK ());
}
return sb.toString (); return sb.toString ();
} // getInfo } // getInfo

25
org.adempiere.base/src/org/compiere/util/CLogMgt.java
View File

@ -559,8 +559,8 @@ public class CLogMgt
sb.append(getMsg("ImplementationVendor")).append(eq).append(org.compiere.Adempiere.getImplementationVendor()).append(NL); sb.append(getMsg("ImplementationVendor")).append(eq).append(org.compiere.Adempiere.getImplementationVendor()).append(NL);
sb.append(getMsg("ImplementationVersion")).append(eq).append(org.compiere.Adempiere.getImplementationVersion()).append(NL); sb.append(getMsg("ImplementationVersion")).append(eq).append(org.compiere.Adempiere.getImplementationVersion()).append(NL);
// //
sb.append("AdempiereHome = ").append(Adempiere.getAdempiereHome()).append(NL); sb.append("iDempiereHome = ").append(Adempiere.getAdempiereHome()).append(NL);
sb.append("AdempiereProperties = ").append(Ini.getPropertyFileName()).append(NL); sb.append("iDempiereProperties = ").append(Ini.getPropertyFileName()).append(NL);
sb.append(Env.getLanguage(Env.getCtx())).append(NL); sb.append(Env.getLanguage(Env.getCtx())).append(NL);
MClient client = MClient.get(Env.getCtx()); MClient client = MClient.get(Env.getCtx());
sb.append(client).append(NL); sb.append(client).append(NL);
@ -686,15 +686,20 @@ public class CLogMgt
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
CConnection cc = CConnection.get(); CConnection cc = CConnection.get();
// Host // Host
sb.append(cc.getAppsHost()).append(" ("); sb.append(cc.getAppsHost());
// Server if (Ini.isClient())
if (!cc.getAppsHost().equalsIgnoreCase("MyAppsServer") && cc.isAppsServerOK(false)) {
sb.append(CConnection.get().getServerVersion()); sb.append(" (");
else
sb.append(getMsg("NotActive")); // Server
// if (!cc.getAppsHost().equalsIgnoreCase("MyAppsServer") && cc.isAppsServerOK(false))
sb.append(")\n "); sb.append(CConnection.get().getServerVersion());
else
sb.append(getMsg("NotActive"));
//
sb.append(")\n ");
}
// //
return sb.toString(); return sb.toString();
} // getServerInfo } // getServerInfo