costin 01/12/02 14:09:54 Added: jk/native2/server/apache2 jk_logger_apache2.c Log: A logger implementation that send the logs to apache's error.log. Instead of tracking 2 log files and setting up mod_jk.log, we now use the native log format. This is not yet completed, but works. One big question is if we can pass the (...) params ( using va_list or some other tricks ) from one function to another. ( apache's log have no va_arg variant for the log function ) Revision Changes Path 1.1 jakarta-tomcat-connectors/jk/native2/server/apache2/jk_logger_apache2.c Index: jk_logger_apache2.c =================================================================== /* ========================================================================= * * * * The Apache Software License, Version 1.1 * * * * Copyright (c) 1999-2001 The Apache Software Foundation. * * All rights reserved. * * * * ========================================================================= * * * * Redistribution and use in source and binary forms, with or without modi- * * fication, are permitted provided that the following conditions are met: * * * * 1. Redistributions of source code must retain the above copyright notice * * notice, this list of conditions and the following disclaimer. * * * * 2. Redistributions in binary form must reproduce the above copyright * * notice, this list of conditions and the following disclaimer in the * * documentation and/or other materials provided with the distribution. * * * * 3. The end-user documentation included with the redistribution, if any, * * must include the following acknowlegement: * * * * "This product includes software developed by the Apache Software * * Foundation <http://www.apache.org/>." * * * * Alternately, this acknowlegement may appear in the software itself, if * * and wherever such third-party acknowlegements normally appear. * * * * 4. The names "The Jakarta Project", "Jk", and "Apache Software * * Foundation" must not be used to endorse or promote products derived * * from this software without prior written permission. For written * * permission, please contact <[EMAIL PROTECTED]>. * * * * 5. Products derived from this software may not be called "Apache" nor may * * "Apache" appear in their names without prior written permission of the * * Apache Software Foundation. * * * * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED WARRANTIES * * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY * * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL * * THE APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY * * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, * * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN * * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * * POSSIBILITY OF SUCH DAMAGE. * * * * ========================================================================= * * * * This software consists of voluntary contributions made by many indivi- * * duals on behalf of the Apache Software Foundation. For more information * * on the Apache Software Foundation, please see <http://www.apache.org/>. * * * * ========================================================================= */ /** * Description: Logger implementation using apache's native logging. * * This is the result of lazyness - a single log file to watch ( error.log ) * instead of 2, no need to explain/document/decide where to place mod_jk * logging, etc. * * Normal apache logging rules apply. * * XXX Jk will use per/compoment logging level. All logs will be WARN level * in apache, and the filtering will happen on each component level. * * XXX Add file/line * * XXX Use env, use the current request structure ( so we can split the log * based on vhost configs ). * * @author Costin Manolache */ #include "jk_util.h" #include "jk_env.h" #include "jk_map.h" #include "jk_logger.h" #include <stdio.h> #include "httpd.h" #define HUGE_BUFFER_SIZE (8*1024) int JK_METHOD jk_logger_apache2_factory(jk_env_t *env, void **result, char *type, char *name); static int jk_logger_apache2_log(jk_logger_t *l, int level, const char *what) { return JK_TRUE; } static int jk_logger_apache2_open(jk_logger_t *_this, jk_map_t *properties ) { return JK_TRUE; } static int jk_logger_apache2_close(jk_logger_t *_this) { return JK_TRUE; } static int jk_logger_apache2_jkLog(jk_logger_t *l, const char *file, int line, int level, const char *fmt, ...) { /* XXX map jk level to apache level */ server_rec *s=(server_rec *)l->logger_private; va_list args; int rc; /* XXX XXX Change this to "SMALLSTACK" or something, I don't think it's netware specific */ #ifdef NETWARE /* On NetWare, this can get called on a thread that has a limited stack so */ /* we will allocate and free the temporary buffer in this function */ char *buf; #else char buf[HUGE_BUFFER_SIZE]; #endif if( s==NULL ) { return JK_FALSE; } va_start(args, fmt); #ifdef WIN32 rc = _vsnprintf(buf, HUGE_BUFFER_SIZE, fmt, args); #elif defined(NETWARE) /* until we get a vsnprintf function */ /* XXX Can we use a pool ? */ /* XXX It'll go away with env and per thread data !! */ buf = (char *) malloc(HUGE_BUFFER_SIZE); rc = vsprintf(buf, fmt, args); free(buf); #else rc = vsnprintf(buf, HUGE_BUFFER_SIZE, fmt, args); #endif va_end(args); ap_log_error( file, line, level, 0, s, buf); return rc ; } int jk_logger_apache2_factory(jk_env_t *env, void **result, char *type, char *name) { jk_logger_t *l = (jk_logger_t *)malloc(sizeof(jk_logger_t)); if(l==NULL ) { return JK_FALSE; } l->log = jk_logger_apache2_log; l->logger_private = NULL; l->open =jk_logger_apache2_open; l->jkLog = jk_logger_apache2_jkLog; *result=(void *)l; return JK_TRUE; }
-- To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
