COMMON_LIB:=-lglite_lb_common
-EXT_LIB:=-lglite_lbu_trio -L${log4c_prefix}/lib -llog4c
+EXT_LIB:=-lglite_lbu_trio -lglite_lbu_log
GLITE_GSS_LIB:=-lglite_security_gss
SRVBONES_LIB:= -L${stagedir}/lib -lglite_lbu_server_bones
LB_COMMON_LIB:=-L${stagedir}/lib -lglite_lb_common_${nothrflavour}
LB_UTILS_DB_LIB:=-L${stagedir}/lib -lglite_lbu_db
- LDFLAGS:= -L${stagedir}/lib
+ LDFLAGS:= -L${stagedir}/lib -L${stagedir}/${libdir}
endif
# LB_MACHINE_LIB:=${stagedir}/lib/libglite_lb_statemachine.a
endif
VOMS_LIBS:=-L${voms_prefix}/${libdir} -lvomsapi${vomsflavour}
LCAS_LIBS:=-L${lcas_prefix}/${libdir} -llcas
-LOG4C_LIBS:=-L${log4c_prefix}/lib -llog4c
#EXT_LIBS:= \
# ${expatlib} -lexpat \
${CLASSADS_LIBS} \
${CARES_LIBS} \
${LCAS_LIBS} \
- ${VOMS_LIBS} \
- ${LOG4C_LIBS}
+ ${VOMS_LIBS}
-COMMON_LIBS:= -L${stagedir}/lib -lglite_lb_common_${nothrflavour} -lglite_security_gss_${nothrflavour} -lglite_lbu_trio -lglite_lbu_maildir
+COMMON_LIBS:= -L${stagedir}/lib -lglite_lb_common_${nothrflavour} -lglite_security_gss_${nothrflavour} -lglite_lbu_trio -lglite_lbu_maildir -lglite_lbu_log
BKSERVER_BASE_OBJS:= \
bkserverd.o il_lbproxy.o get_events.o index.o jobstat.o jobstat_supp.o \
gsoap_version ?= ${gsoap_default_version}
dotless_gsoap_ver:=${shell echo ${gsoap_version} | tr -d . }
-ifeq ($(shell test -f ${stagedir}/lib/libglite_security_gsoap_plugin_${dotless_gsoap_ver}_${nothrflavour}_c.so && echo ok),ok)
+ifeq ($(shell test -f ${stagedir}/${libdir}/libglite_security_gsoap_plugin_${dotless_gsoap_ver}_${nothrflavour}_c.so && echo ok),ok)
langflavour:=_c
endif
-GSOAP_LIB:=-L${stagedir}/lib -lglite_security_gsoap_plugin_${dotless_gsoap_ver}_${nothrflavour}${langflavour}
+GSOAP_LIB:=-L${stagedir}/${libdir} -lglite_security_gsoap_plugin_${dotless_gsoap_ver}_${nothrflavour}${langflavour}
ifeq ($(GLITE_LB_SERVER_WITH_WS),yes)
BKSERVER_OBJS:= \
${GSOAP_LIB} \
${EXT_LIBS} \
${classadslib} \
- -lglite_lbu_maildir
+ -lglite_lbu_maildir \
+ -lglite_lbu_log
else
BKSERVER_OBJS:= ${BKSERVER_BASE_OBJS}
-lglite_security_gss_${nothrflavour} \
${EXT_LIBS} \
${classadslib} \
- -lglite_lbu_maildir
+ -lglite_lbu_maildir \
+ -lglite_lbu_log
endif
INDEX_OBJS:= index.o index_parse.o jobstat_supp.o openserver.o \
test_query_events: ${query_events_objs}
${LINKXX} -o $@ ${query_events_objs} \
- ${TEST_LIBS} ${LB_COMMON_LIB} ${LB_MACHINE_LIB} ${classadslib} ${LOG4C_LIBS}
+ ${TEST_LIBS} ${LB_COMMON_LIB} ${LB_MACHINE_LIB} ${classadslib} -lglite_lbu_log
test.soapconv: test_soap_conv
./test_soap_conv
top_srcdir=..
-stagedir=../stage
+builddir=build
+top_builddir=${top_srcdir}/${builddir}
+stagedir=.
+distdir=.
globalprefix=glite
lbutilsprefix=lbu
package=glite-lbu-log
version=0.0.0
PREFIX=/opt/glite
-
log4c_prefix=/usr
-include Makefile.inc
--include ./project/version.properties
+-include ../project/version.properties
+
+version=${module.version}
+
+CC=gcc
+VPATH=${top_srcdir}/interface:${top_srcdir}/src
+
+LOG4C_CFLAGS:=-I${log4c_prefix}/include
+LOG4C_LIBS:=-L${log4c_prefix}/${libdir} -L${log4c_prefix}/lib -llog4c
+
+DEBUG:=-g -O0 -W -Wall
+
+CFLAGS:= \
+ ${DEBUG} \
+ -I${stagedir}/include -I${top_srcdir}/src \
+ -I${top_srcdir}/interface \
+ ${LOG4C_CFLAGS}
+
+LDFLAGS:=-L${stagedir}/${libdir}
-HEADER=log.h
+COMPILE:=libtool --mode=compile ${CC} ${CFLAGS}
+LINK:=libtool --mode=link ${CC} -rpath ${stagedir}/${libdir} ${LDFLAGS}
+INSTALL:=libtool --mode=install install
-default: compile
+OBJS:=log.o
+LOBJS:=${OBJS:.o=.lo}
+LTLIB:=libglite_lbu_log.la
-compile:
+# In order to use libtool versioning correcty, we must have:
+#
+# current = major + minor + offset
+# revision = patch
+# age = minor
+#
+# where offset is a sum of maximal released minor's of all previous major's
+#
+
+# counted minors: n/a
+offset=0
+
+version_info:=-version-info ${shell \
+ perl -e '$$,=":"; @F=split "\\.","${version}"; print $$F[0]+$$F[1]+${offset},$$F[2],$$F[1]' }
+
+default all: compile
+
+compile: ${LTLIB}
stage: compile
$(MAKE) install PREFIX=${stagedir}
install: compile
mkdir -p ${PREFIX}/include/${globalprefix}/${lbutilsprefix}
- install -m 644 ${HEADER} ${PREFIX}/include/${globalprefix}/${lbutilsprefix}
+ ${INSTALL} -m 644 ${top_srcdir}/src/log.h ${PREFIX}/include/${globalprefix}/${lbutilsprefix}
mkdir -p ${PREFIX}/share/doc/${package}-${version}
- install -m 644 LICENSE ${PREFIX}/share/doc/${package}-${version}
+ ${INSTALL} -m 644 ${top_srcdir}/LICENSE ${PREFIX}/share/doc/${package}-${version}
mkdir -p ${PREFIX}/etc
- install -m 644 log4crc.example ${PREFIX}/etc/glite-lb-log4crc
+ ${INSTALL} -m 644 ${top_srcdir}/src/log4crc.* ${PREFIX}/share/doc/${package}-${version}
+ ${INSTALL} -m 644 ${top_srcdir}/src/log4crc.example-production ${PREFIX}/etc/glite-lb-log4crc
+ ${INSTALL} -m 755 ${LTLIB} ${PREFIX}/${libdir}/${LTLIB}
+
clean:
+ rm -rvf *.o *.lo .libs lib*
rm -rvf log.xml project/ rpmbuild/ RPMS/ tgz/
check:
+
+${LTLIB}: ${LOBJS}
+ ${LINK} ${version_info} -o $@ $+ ${LOG4C_LIBS}
+
+%.o %.lo: %.c
+ ${COMPILE} -c $<
# $Header$
-module.version=0.0.0
+module.version=1.0.0
module.age=0
--- /dev/null
+#ident "$Header$"
+
+#include <stdarg.h>
+#include <stdio.h>
+#include <log4c.h>
+#include "log.h"
+
+/**
+ * constructor
+ *
+ * @returns 0 for success
+ */
+int glite_common_log_init(void) {
+#ifndef WITHOUT_LOG4C
+ return(log4c_init());
+#else
+ return 0;
+#endif
+}
+
+/**
+ * destructor
+ *
+ * @returns 0 for success
+ */
+int glite_common_log_fini(void) {
+#ifndef WITHOUT_LOG4C
+ return(log4c_fini());
+#else
+ return 0;
+#endif
+}
+
+/**
+ * Log a message with the specified priority.
+ * @param catName category name
+ * @param a_priority The priority of this log message.
+ * @param msg message
+ **/
+void glite_common_log_msg(char *catName,int a_priority, char *msg) {
+#ifndef WITHOUT_LOG4C
+ const log4c_category_t* a_category = log4c_category_get(catName);
+
+ if (log4c_category_is_priority_enabled(a_category, a_priority)) {
+ log4c_category_log(log4c_category_get(catName), a_priority, msg);
+ }
+#else
+ printf(msg);
+#endif
+}
+
+/**
+ * Log a message with the specified priority.
+ * @param catName category name
+ * @param a_priority The priority of this log message.
+ * @param a_format Format specifier for the string to write in the log file.
+ * @param ... The arguments for a_format
+ **/
+void glite_common_log(char *catName,int a_priority, const char* a_format,...) {
+#ifndef WITHOUT_LOG4C
+ const log4c_category_t* a_category = log4c_category_get(catName);
+
+ if (log4c_category_is_priority_enabled(a_category, a_priority)) {
+ va_list va;
+
+ va_start(va, a_format);
+ log4c_category_vlog(a_category, a_priority, a_format, va);
+ va_end(va);
+ }
+#else
+ va_list va;
+
+ va_start(va, a_format);
+ vprintf(va, a_format);
+ va_end(va);
+#endif
+}
+
+/*
+ * Rereads any log4crc files that have changed
+ */
+void glite_common_log_reread(void) {
+#ifndef WITHOUT_LOG4C
+ log4c_reread();
+#endif
+}
+
+
extern "C" {
#endif
-#include <stdarg.h>
-#include <stdio.h>
#include <log4c.h>
/* default categories */
*
* @returns 0 for success
*/
-static inline int glite_common_log_init(void) {
-#ifndef WITHOUT_LOG4C
- return(log4c_init());
-#else
- return 0;
-#endif
-}
+extern int glite_common_log_init(void);
/**
* destructor
*
* @returns 0 for success
*/
-static inline int glite_common_log_fini(void) {
-#ifndef WITHOUT_LOG4C
- return(log4c_fini());
-#else
- return 0;
-#endif
-}
+extern int glite_common_log_fini(void);
/**
* Log a message with the specified priority.
* @param a_priority The priority of this log message.
* @param msg message
**/
-static inline void glite_common_log_msg(char *catName,int a_priority, char *msg) {
-#ifndef WITHOUT_LOG4C
- const log4c_category_t* a_category = log4c_category_get(catName);
-
- if (log4c_category_is_priority_enabled(a_category, a_priority)) {
- log4c_category_log(log4c_category_get(catName), a_priority, msg);
- }
-#else
- printf(msg);
-#endif
-}
+extern void glite_common_log_msg(char *catName,int a_priority, char *msg);
/**
* Log a message with the specified priority.
* @param a_format Format specifier for the string to write in the log file.
* @param ... The arguments for a_format
**/
-static inline void glite_common_log(char *catName,int a_priority, const char* a_format,...) {
-#ifndef WITHOUT_LOG4C
- const log4c_category_t* a_category = log4c_category_get(catName);
-
- if (log4c_category_is_priority_enabled(a_category, a_priority)) {
- va_list va;
-
- va_start(va, a_format);
- log4c_category_vlog(a_category, a_priority, a_format, va);
- va_end(va);
- }
-#else
- va_list va;
-
- va_start(va, a_format);
- vprintf(va, a_format);
- va_end(va);
-#endif
-}
+extern void glite_common_log(char *catName,int a_priority, const char* a_format,...);
/*
* Rereads any log4crc files that have changed
*/
-static inline void glite_common_log_reread(void) {
-#ifndef WITHOUT_LOG4C
- log4c_reread();
-#endif
-}
+extern void glite_common_log_reread(void);
#ifdef __cplusplus
}
--- /dev/null
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE log4c SYSTEM "">
+
+<log4c version="1.2.1">
+
+ <config>
+ <bufsize>0</bufsize>
+ <debug level="0"/>
+ <nocleanup>0</nocleanup>
+ </config>
+
+ <!-- default categories ==================================== -->
+ <category name="root" priority="notice"/>
+
+ <category name="SECURITY" priority="debug" appender="stderr"/>
+ <category name="ACCESS" priority="debug" appender="stderr"/>
+ <category name="CONTROL" priority="debug" appender="stderr"/>
+ <category name="LB" priority="debug" appender="stderr"/>
+
+ <!-- to debug only a particular LB component use: -->
+ <!-- category name="LB.LOGD" priority="debug" appender="stderr"/-->
+ <!-- category name="LB.INTERLOGD" priority="debug" appender="stderr"/-->
+ <!-- category name="LB.SERVER" priority="debug" appender="stderr"/-->
+ <!-- category name="LB.SERVER.DB" priority="debug" appender="stderr"/-->
+ <!-- category name="LB.SERVER.REQUEST" priority="debug" appender="stderr"/-->
+
+ <!-- default appenders ===================================== -->
+ <appender name="stdout" type="stream" layout="basic"/>
+ <appender name="stderr" type="stream" layout="basic"/>
+ <appender name="syslog" type="syslog" layout="dated"/>
+
+ <!-- default layouts ======================================= -->
+ <layout name="basic" type="basic"/>
+ <layout name="dated" type="dated"/>
+</log4c>
+
-I${stagedir}/include \
-I${log4c_prefix}/include \
-D_GNU_SOURCE
-LDFLAGS:=
+LDFLAGS:=-L${stagedir}/${libdir}
ifdef LB_PROF
CFLAGS:= ${CFLAGS} -pg -g
endif
COMPILE:=libtool --mode=compile ${CC} ${CFLAGS}
-LINK:=libtool --mode=link ${CC} -rpath ${stagedir}/lib ${LDFLAGS} ${LOG4C_LIBS}
+LINK:=libtool --mode=link ${CC} -rpath ${stagedir}/${libdir} ${LDFLAGS}
INSTALL:=libtool --mode=install install
-LOG4C_LIBS:=-L${log4c_prefix}/lib -llog4c
STATICLIB:=libglite_lbu_server_bones.a
LTLIB:=libglite_lbu_server_bones.la
ranlib $@
${LTLIB}: ${LOBJS}
- ${LINK} ${version_info} -o $@ ${LOBJS} ${LOG4C_LIBS}
+ ${LINK} ${version_info} -o $@ ${LOBJS} -lglite_lbu_log
stage: compile
$(MAKE) install PREFIX=${stagedir} DOSTAGE=yes
install:
mkdir -p ${PREFIX}/include/${globalprefix}/${lbutilsprefix}
- mkdir -p ${PREFIX}/lib
- ${INSTALL} -m 644 ${LTLIB} ${PREFIX}/lib
- ${INSTALL} -m 644 ${STATICLIB} ${PREFIX}/lib ; \
+ mkdir -p ${PREFIX}/${libdir}
+ ${INSTALL} -m 644 ${LTLIB} ${PREFIX}/${libdir}
+ ${INSTALL} -m 644 ${STATICLIB} ${PREFIX}/${libdir} ; \
cd ${top_srcdir}/interface && install -m 644 ${HDRS} ${PREFIX}/include/${globalprefix}/${lbutilsprefix}
clean:
git://scientific.zcu.cz / jra1mw.git / commitdiff