[cpp-log4shib] branch master updated: Incorporate some Debian patches.
Scott Cantor
cantor.2 at osu.edu
Mon Jun 18 15:53:42 EDT 2018
This is an automated email from the git hooks/post-receive script.
scantor pushed a commit to branch master
in repository cpp-log4shib.
View the commit online:
http://git.shibboleth.net/view/?p=cpp-log4shib.git;a=commit;h=bf352a35c708a4ea8ca4bcb5e59b362cf88b85ef
The following commit(s) were added to refs/heads/master by this push:
new bf352a3 Incorporate some Debian patches.
bf352a3 is described below
commit bf352a35c708a4ea8ca4bcb5e59b362cf88b85ef
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Mon Jun 18 15:53:32 2018 -0400
Incorporate some Debian patches.
---
configure.ac | 5 ++--
doc/Doxyfile.in | 2 --
include/log4shib/PatternLayout.hh | 52 +++++++++++++++++++--------------------
log4shib.pc.in | 2 +-
4 files changed, 28 insertions(+), 33 deletions(-)
diff --git a/configure.ac b/configure.ac
index 49cf29f..a05d080 100644
--- a/configure.ac
+++ b/configure.ac
@@ -102,8 +102,8 @@ AC_CHECK_FUNCS([syslog gettimeofday ftime localtime_r gmtime_r])
# ----------------------------------------------------------------------------
# for RemoteSyslogAppender
-AC_CHECK_LIB(socket,socket, LIBS="-lsocket $LIBS",,)
-AC_CHECK_LIB(nsl,gethostbyname, LIBS="-lnsl $LIBS",,)
+AC_SEARCH_LIBS([socket],[socket],,[AC_MSG_ERROR([cannot find socket() function])])
+AC_SEARCH_LIBS([gethostbyname],[nsl],,[AC_MSG_ERROR([cannot find gethostbyname() function])])
# checks for pthreads
AX_PTHREAD([enable_threads="pthread"],[enable_threads="no"])
@@ -140,7 +140,6 @@ BB_ENABLE_DOXYGEN
#BB_CHECK_OMNITHREADS
#BB_CHECK_PTHREADS
-LOG4SHIB_CFLAGS="$CXXFLAGS"
LOG4SHIB_LIBS="-llog4shib"
LOG4SHIB_LIBDEPS="$LIBS"
LOG4SHIB_VERSION="$VERSION"
diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in
index 924c09a..33fd1fa 100644
--- a/doc/Doxyfile.in
+++ b/doc/Doxyfile.in
@@ -62,6 +62,4 @@ COLLABORATION_GRAPH = YES
INCLUDE_GRAPH = YES
INCLUDED_BY_GRAPH = YES
GRAPHICAL_HIERARCHY = YES
-MAX_DOT_GRAPH_WIDTH = 1024
-MAX_DOT_GRAPH_HEIGHT = 1024
GENERATE_LEGEND = YES
diff --git a/include/log4shib/PatternLayout.hh b/include/log4shib/PatternLayout.hh
index a1bb956..4428edc 100644
--- a/include/log4shib/PatternLayout.hh
+++ b/include/log4shib/PatternLayout.hh
@@ -48,38 +48,36 @@ namespace log4shib {
PatternLayout();
virtual ~PatternLayout();
- // NOTE: All double percentage signs ('%%') followed by a character
- // in the following comments should actually be a single char.
- // The doubles are included so that doxygen will print them correctly.
/**
- * Formats the LoggingEvent in the style set by
- * the setConversionPattern call. By default, set
- * to "%%m%%n"
+ Formats the LoggingEvent in the style set by
+ the setConversionPattern call. By default, set
+ to "%m%n"
**/
virtual std::string format(const LoggingEvent& event);
/**
- * Sets the format of log lines handled by this
- * PatternLayout. By default, set to "%%m%%n".<br>
- * Format characters are as follows:<br>
- * <li><b>%%</b> - a single percent sign</li>
- * <li><b>%%c</b> - the category</li>
- * <li><b>%%d</b> - the date\n
- * Date format: The date format character may be followed by a date format
- * specifier enclosed between braces. For example, %%d{%%H:%%M:%%S,%%l} or %%d{%%d %%m %%Y %%H:%%M:%%S,%%l}.
- * If no date format specifier is given then the following format is used:
- * "Wed Jan 02 02:03:55 1980". The date format specifier admits the same syntax
- * as the ANSI C function strftime, with 1 addition. The addition is the specifier
- * %%l for milliseconds, padded with zeros to make 3 digits.</li>
- * <li><b>%%m</b> - the message</li>
- * <li><b>%%n</b> - the platform specific line separator</li>
- * <li><b>%%p</b> - the priority</li>
- * <li><b>%%r</b> - milliseconds since this layout was created.</li>
- * <li><b>%%R</b> - seconds since Jan 1, 1970</li>
- * <li><b>%%u</b> - clock ticks since process start</li>
- * <li><b>%%x</b> - the NDC</li>
- * @param conversionPattern the conversion pattern
- * @exception ConfigureFailure if the pattern is invalid
+ Sets the format of log lines handled by this
+ PatternLayout. By default, set to "%m%n".
+ Format characters are as follows:
+ - <b>%%</b> - a single percent sign
+ - <b>%%c</b> - the category
+ - <b>%%d</b> - the date\n
+ Date format: The date format character may be followed by a date format
+ specifier enclosed between braces. For example, %%d{%%H:%%M:%%S,%%l} or %%d{%%d %%m %%Y %%H:%%M:%%S,%%l}.
+ If no date format specifier is given then the following format is used:
+ "Wed Jan 02 02:03:55 1980". The date format specifier admits the same syntax
+ as the ANSI C function strftime, with 1 addition. The addition is the specifier
+ %%l for milliseconds, padded with zeros to make 3 digits.
+ - <b>%%m</b> - the message
+ - <b>%%n</b> - the platform specific line separator
+ - <b>%%p</b> - the priority
+ - <b>%%r</b> - milliseconds since this layout was created
+ - <b>%%R</b> - seconds since Jan 1, 1970
+ - <b>%%u</b> - clock ticks since process start
+ - <b>%%x</b> - the NDC
+
+ @param conversionPattern the conversion pattern
+ @exception ConfigureFailure if the pattern is invalid
**/
virtual void setConversionPattern(const std::string& conversionPattern)
throw(ConfigureFailure);
diff --git a/log4shib.pc.in b/log4shib.pc.in
index 6a39ba4..fb91e2d 100644
--- a/log4shib.pc.in
+++ b/log4shib.pc.in
@@ -7,4 +7,4 @@ Name: @PACKAGE@
Description: C++ library for flexible logging, modeled after Log4j
Version: @VERSION@
Libs: -L${libdir} @log4shib_libs@
-Cflags: -I${includedir} @log4shib_cflags@
+Cflags: -I${includedir}
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list