hgomez      2004/02/09 04:01:22

  Modified:    jk/native2/server/apache2 mod_jk2.c jk_service_apache2.c
  Log:
  Remove obsolete linefeeds from the logs, see the ap_log_* functions 
  dont need trailing linefeeds.
  
  Thanks to Gunter Knauf
  
  Revision  Changes    Path
  1.65      +9 -9      jakarta-tomcat-connectors/jk/native2/server/apache2/mod_jk2.c
  
  Index: mod_jk2.c
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache2/mod_jk2.c,v
  retrieving revision 1.64
  retrieving revision 1.65
  diff -u -r1.64 -r1.65
  --- mod_jk2.c 30 Sep 2003 13:42:02 -0000      1.64
  +++ mod_jk2.c 9 Feb 2004 12:01:22 -0000       1.65
  @@ -141,7 +141,7 @@
       rc=workerEnv->config->setPropertyString( env, workerEnv->config, (char *)name, 
value );
       if (rc!=JK_OK) {
           ap_log_perror(APLOG_MARK, APLOG_NOTICE, 0, cmd->temp_pool,
  -                      "mod_jk2: Unrecognized option %s %s\n", name, value);
  +                      "mod_jk2: Unrecognized option %s %s", name, value);
       }
   
       return NULL;
  @@ -164,14 +164,14 @@
   
       if( name == NULL || property==NULL || value==NULL ) {
           ap_log_perror(APLOG_MARK, APLOG_NOTICE, 0, cmd->temp_pool,
  -                      "mod_jk2: Null option in JkSet2\n");
  +                      "mod_jk2: Null option in JkSet2");
           return NULL;
       }
       
       mbean=env->getBean( env, name );
       if( mbean==NULL ) {
           ap_log_perror(APLOG_MARK, APLOG_NOTICE, 0, cmd->temp_pool,
  -                      "mod_jk2: Creating object %s\n", name );
  +                      "mod_jk2: Creating object %s", name );
           mbean=env->createBean( env, workerEnv->config->pool, (char *)name );
       }
   
  @@ -188,7 +188,7 @@
   
       if (rc!=JK_OK) {
           ap_log_perror(APLOG_MARK, APLOG_NOTICE, 0, cmd->temp_pool,
  -                      "mod_jk2: Unrecognized option %s %s %s\n", name, property, 
value);
  +                      "mod_jk2: Unrecognized option %s %s %s", name, property, 
value);
       }
   
       return NULL;
  @@ -266,7 +266,7 @@
       /* now lets actually add the parameter set in the <Location> block */
       uriEnv->mbean->setAttribute( workerEnv->globalEnv, uriEnv->mbean, (char *)name, 
(void *)val );
   
  -/*     fprintf(stderr, "JkUriSet  %s %s dir=%s args=%s\n", */
  +/*     fprintf(stderr, "JkUriSet  %s %s dir=%s args=%s", */
   /*             uriEnv->workerName, cmd->path, */
   /*             cmd->directive->directive, */
   /*             cmd->directive->args); */
  @@ -452,11 +452,11 @@
       if( s->is_virtual ) {
           /* Virtual host */
           ap_log_perror(APLOG_MARK, APLOG_DEBUG, 0, p,
  -                      "mod_jk Create config for virtual host %s\n",
  +                      "mod_jk Create config for virtual host %s",
                         s->server_hostname );
       } else {
           ap_log_perror(APLOG_MARK, APLOG_DEBUG, 0, p,
  -                      "mod_jk Create config for default server %s\n",
  +                      "mod_jk Create config for default server %s",
                         s->server_hostname );
       }
   
  @@ -483,7 +483,7 @@
       jk_uriEnv_t *overrides = (jk_uriEnv_t *)overridesv;
       
       ap_log_perror(APLOG_MARK, APLOG_DEBUG, 0, p,
  -                  "mod_jk Merging workerEnv\n");
  +                  "mod_jk Merging workerEnv");
   
       
       /* The 'mountcopy' option should be implemented in common.
  
  
  
  1.39      +2 -2      
jakarta-tomcat-connectors/jk/native2/server/apache2/jk_service_apache2.c
  
  Index: jk_service_apache2.c
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/jk/native2/server/apache2/jk_service_apache2.c,v
  retrieving revision 1.38
  retrieving revision 1.39
  diff -u -r1.38 -r1.39
  --- jk_service_apache2.c      2 Feb 2004 18:23:55 -0000       1.38
  +++ jk_service_apache2.c      9 Feb 2004 12:01:22 -0000       1.39
  @@ -311,7 +311,7 @@
        */
       if(ap_rflush(rr) != APR_SUCCESS) {
           ap_log_error(APLOG_MARK, APLOG_STARTUP | APLOG_NOERRNO, 0, 
  -                     NULL, "mod_jk: Error flushing \n"  );
  +                     NULL, "mod_jk: Error flushing"  );
           return JK_ERR;
       }
       
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to