[Smartfrog-checkins] core/smartfrog/src/org/smartfrog/services/www LivenessPageChecker.java,1.2,1.3 LivenessPageComponent.java,1.2,1.3

[Steve L. <st...@us...>]

Update of /cvsroot/smartfrog/core/smartfrog/src/org/smartfrog/services/www
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18244/smartfrog/src/org/smartfrog/services/www

Modified Files:
	LivenessPageChecker.java LivenessPageComponent.java 
Log Message:
liveness page has enable/disable functional; builds urls better

Index: LivenessPageChecker.java
===================================================================
RCS file: /cvsroot/smartfrog/core/smartfrog/src/org/smartfrog/services/www/LivenessPageChecker.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** LivenessPageChecker.java	16 Jul 2004 09:42:54 -0000	1.2
--- LivenessPageChecker.java	19 Jul 2005 00:03:47 -0000	1.3
***************
*** 182,190 ****
       */
      protected void makeURL() throws SmartFrogDeploymentException {
!         String target = protocol + "://" + host + ':' + port + '/' + page;
          if(queries!=null) {
!             target+=queries;
          }
!         bindToURL(target);
      }
  
--- 182,200 ----
       */
      protected void makeURL() throws SmartFrogDeploymentException {
!         StringBuffer target=new StringBuffer();
!         target.append(protocol);
!         target.append("://" );
!         target.append(host);
!         target.append(':');
!         target.append(port);
!         if(!page.startsWith("/")) {
!             target.append('/');
!         }
!         target.append(page);
!                                 
          if(queries!=null) {
!             target.append(queries);
          }
!         bindToURL(target.toString());
      }
  

Index: LivenessPageComponent.java
===================================================================
RCS file: /cvsroot/smartfrog/core/smartfrog/src/org/smartfrog/services/www/LivenessPageComponent.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** LivenessPageComponent.java	16 Jul 2004 09:42:54 -0000	1.2
--- LivenessPageComponent.java	19 Jul 2005 00:03:47 -0000	1.3
***************
*** 43,46 ****
--- 43,51 ----
  
      /**
+      * enabled flag
+      */ 
+     boolean enabled=true;
+     
+     /**
       * the class that contains all the checking code. This is on the side
       * for reuse in other components.
***************
*** 59,62 ****
--- 64,72 ----
  
      /**
+      * a log
+      */
+     Log log;
+     
+     /**
       * empty constructor
       *
***************
*** 108,111 ****
--- 118,122 ----
  
  
+         enabled = sfResolve(ENABLED,enabled,false);
  
          //now tell the liveness page it is deployed
***************
*** 113,123 ****
  
          log = new ComponentHelper(this).getLogger();
!         log.info("Deployed " + toString());
      }
  
!     /**
!      * a log
!      */
!     Log log;
  
      /**
--- 124,131 ----
  
          log = new ComponentHelper(this).getLogger();
!         log.info("Checking " + toString());
      }
  
! 
  
      /**
***************
*** 132,136 ****
  
          //check the counter
!         if (nextCheck-- <= 0) {
              //reset it
              nextCheck = checkFrequency;
--- 140,144 ----
  
          //check the counter
!         if (enabled && nextCheck-- <= 0) {
              //reset it
              nextCheck = checkFrequency;
***************
*** 147,151 ****
          //delegate
          if (livenessPage != null) {
!             return livenessPage.toString();
          } else {
              return "undeployed liveness checker";
--- 155,159 ----
          //delegate
          if (livenessPage != null) {
!             return livenessPage.toString() + (enabled ? "" : " (disabled)");
          } else {
              return "undeployed liveness checker";