- Timestamp:
- 08/08/10 15:51:43 (14 years ago)
- Location:
- trunk/src/com/bowman/cardserv
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/com/bowman/cardserv/CardServProxy.java
r12 r17 181 181 startTimeStamp = System.currentTimeMillis(); 182 182 183 logger.info("-= CardServProxy " + APP_VERSION + " initialized =-");183 logger.info("-= CardServProxy " + APP_VERSION + APP_BUILD + " initialized =-"); 184 184 logger.fine("CA-Profiles: "); 185 185 CaProfile cp; -
trunk/src/com/bowman/cardserv/ProxyConfig.java
r1 r17 41 41 private int wtMaxDelay, etMinCount, maxThreads, sessionTimeout, newcamdMaxMsgSize, maxPending, maxConnectionsIP; 42 42 private boolean silent, debug, userAllowOnFailure, logFailures, logEcm, logEmm, logZap, hideIPs, blockCaidMismatch; 43 private boolean wtIncludeFile; 43 44 44 45 private boolean firstRead = true, started = false; … … 127 128 public boolean isDebug() { 128 129 return debug; 130 } 131 132 public boolean isIncludeFileEvents() { 133 return wtIncludeFile; 129 134 } 130 135 … … 336 341 wtBadFlags = wtConfig.getStringValue("bad-flags"); 337 342 wtMaxDelay = wtConfig.getTimeValue("max-delay", "ms"); 343 wtIncludeFile = "true".equalsIgnoreCase(wtConfig.getStringValue("include-file-events", "true")); 338 344 } catch (ConfigException e) { 339 345 wtBadFlags = "YMNTSAOQGXWDHU-"; 340 346 wtMaxDelay = 5000; 347 wtIncludeFile = true; 341 348 } 342 349 -
trunk/src/com/bowman/cardserv/cws/CwsServiceMapper.java
r9 r17 568 568 connectors.remove(conn.getName()); 569 569 setLastFailed(id, conn.getName(), false, -1); 570 logger.warning("Service [" + config.getServiceName(msg) + "] no longer available on CWS: " + conn.getName() + 571 " source: " + session); 570 String s = "Service [" + config.getServiceName(msg) + "] no longer available on CWS: " + conn.getName() + 571 " Ecm source was: " + session; 572 if(resetServices.contains(id)) logger.info(s); 573 else logger.warning(s); 572 574 resetSingle(new ServiceMapping(id.serviceId, -1), conn.getName()); 573 575 if(session != null) session.setFlag(msg, '-'); … … 583 585 return; 584 586 } else { 585 logger.warning("Service [" + config.getServiceName(msg) + "] failed to decode on CWS: " + conn.getName() + 586 " (two consecutive failures removes mapping). Ecm source was: " + session); 587 String s = "Service [" + config.getServiceName(msg) + "] failed to decode on CWS: " + conn.getName() + 588 " (two consecutive failures removes mapping). Ecm source was: " + session; 589 if(resetServices.contains(id)) logger.info(s); 590 else logger.warning(s); 587 591 setLastFailed(id, conn.getName(), true, session==null?-1:session.getId()); 588 592 return; -
trunk/src/com/bowman/cardserv/rmi/RemoteHandler.java
r16 r17 570 570 public void onLog(Level l, String label, String message) { 571 571 if(l == Level.SEVERE || l == Level.WARNING) { 572 RemoteEvent re = new RemoteEvent(RemoteEvent.LOG_EVENT, label, message, null); 573 re.setProperty("log-level", l.getName()); 574 fireRemoteEvent(re); 572 if(config.isIncludeFileEvents()) { 573 RemoteEvent re = new RemoteEvent(RemoteEvent.LOG_EVENT, label, message, null); 574 re.setProperty("log-level", l.getName()); 575 fireRemoteEvent(re); 576 } 575 577 } 576 578 } -
trunk/src/com/bowman/cardserv/session/AbstractSession.java
r9 r17 281 281 if(ecmReply.getCaId() != 0 && (ecmRequest.getCaId() != ecmReply.getCaId())) { 282 282 setFlag(ecmRequest, 'M'); 283 logger.warning("Ca-id mismatch, response had ca-id " + Integer.toHexString(ecmReply.getCaId()) +284 " but request was for profile: " + getProfile() );283 logger.warning("Ca-id mismatch, response (from " + ecmReply.getConnectorName() + ") had ca-id " + Integer.toHexString(ecmReply.getCaId()) + 284 " but request was for profile: " + getProfile() + " (from user '" + user + "' - " + clientId + ")"); 285 285 if(ProxyConfig.getInstance().isBlockCaidMismatch()) ecmReply = ecmRequest.getEmptyReply(); 286 286 } -
trunk/src/com/bowman/cardserv/web/XmlHelper.java
r16 r17 390 390 391 391 public void runStatusCmdFileLog(XmlStringBuffer xb, Map params, String user) throws RemoteException { 392 if(!proxy.isAdmin(user) ) {392 if(!proxy.isAdmin(user) || !ProxyConfig.getInstance().isIncludeFileEvents()) { 393 393 xb.appendElement("file-log", "size", "-1", true); 394 394 } else {
Note:
See TracChangeset
for help on using the changeset viewer.