From: Jorg J. <jj...@us...> - 2002-10-15 05:02:38
|
Update of /cvsroot/compiere/client/Src/org/compiere/apps In directory usw-pr-cvs1:/tmp/cvs-serv490/Src/org/compiere/apps Modified Files: AEnv.java ALogin.java Log Message: . Index: AEnv.java =================================================================== RCS file: /cvsroot/compiere/client/Src/org/compiere/apps/AEnv.java,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** AEnv.java 7 Oct 2002 01:19:19 -0000 1.31 --- AEnv.java 15 Oct 2002 05:02:35 -0000 1.32 *************** *** 29,32 **** --- 29,34 ---- import org.compiere.model.*; + import org.apache.log4j.*; + import org.compiere.interfaces.*; import javax.ejb.*; *************** *** 486,497 **** return true; } ! // ! if (s_serverTries < 5) { s_serverTries++; ! return CConnection.get().isAppsServerOK(true); } ! s_server = null; ! return false; } // isServerActive --- 488,512 ---- return true; } ! if (s_serverTries > 2) ! return false; ! ! // Try to connect ! Logger root = Logger.getRootLogger(); ! Level level = root.getLevel(); ! root.setLevel(Level.OFF); ! try { s_serverTries++; ! Log.trace(Log.l3_Util, "AEnv.isServerActive - try #" + s_serverTries); ! ok = CConnection.get().isAppsServerOK(true); } ! catch (Exception ex) ! { ! ok = false; ! s_server = null; ! } ! Logger.getRootLogger().setLevel(level); ! // ! return ok; } // isServerActive Index: ALogin.java =================================================================== RCS file: /cvsroot/compiere/client/Src/org/compiere/apps/ALogin.java,v retrieving revision 1.40 retrieving revision 1.41 diff -C2 -d -r1.40 -r1.41 *** ALogin.java 10 Oct 2002 03:48:03 -0000 1.40 --- ALogin.java 15 Oct 2002 05:02:35 -0000 1.41 *************** *** 22,25 **** --- 22,27 ---- import java.text.*; + import org.apache.log4j.*; + import org.compiere.Compiere; import org.compiere.db.*; *************** *** 121,126 **** --- 123,134 ---- { m_connectionOK = false; + Logger root = Logger.getRootLogger(); + Level level = root.getLevel(); + root.setLevel(Level.OFF); + // m_cc.testAppsServer(); m_cc.testDatabase(); + // + Logger.getRootLogger().setLevel(level); hostField.setDisplay(); } // validateConnection |