/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
- *
- * libtest
*
- * Copyright (C) 2011-2012 Data Differential, http://datadifferential.com/
+ * Data Differential Utility library
*
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
+ * Copyright (C) 2012 Data Differential, http://datadifferential.com/
*
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * * 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.
+ *
+ * * The names of its contributors may not be used to endorse or
+ * promote products derived from this software without specific prior
+ * written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS 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 COPYRIGHT
+ * OWNER OR 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.
*
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#pragma once
#include <cerrno>
+#include <cstdarg>
#include <cstdio>
#include <fcntl.h>
#include <iostream>
VERBOSE_DEBUG= LOG_DEBUG // syslog:LOG_DEBUG
};
+#ifndef __INTEL_COMPILER
+#pragma GCC diagnostic ignored "-Wformat-nonliteral"
+#endif
struct log_info_st
{
if (opt_syslog)
{
char buffer[1024];
- (void)getcwd(buffer, sizeof(buffer));
+ char *getcwd_ret= getcwd(buffer, sizeof(buffer));
syslog(LOG_ERR, "Could not open log file \"%.*s\", from \"%s\", open failed with (%s)",
int(filename.size()), filename.c_str(),
- buffer,
+ getcwd_ret,
strerror(errno));
}
std::cerr << "Could not open log file for writing, switching to stderr." << std::endl;
return fd;
}
- void write(verbose_t verbose, const char *mesg)
+ void write(verbose_t verbose, const char *format, ...)
{
- if (opt_file)
+ if (opt_file or opt_syslog)
{
- char buffer[UTIL_MAX_ERROR_SIZE];
- int buffer_length= snprintf(buffer, sizeof(buffer), "%7s %s\n", verbose_name(verbose), mesg);
- if (::write(file(), buffer, buffer_length) == -1)
+ va_list args;
+ va_start(args, format);
+ char mesg[BUFSIZ];
+ int mesg_length= vsnprintf(mesg, sizeof(mesg), format, args);
+ va_end(args);
+
+ if (opt_file)
{
- std::cerr << "Could not write to log file." << std::endl;
- syslog(LOG_EMERG, "gearmand could not open log file %s, got error %s", filename.c_str(), strerror(errno));
- }
+ char buffer[UTIL_MAX_ERROR_SIZE];
+ int buffer_length= snprintf(buffer, sizeof(buffer), "%7s %.*s\n", verbose_name(verbose), mesg_length, mesg);
+ if (::write(file(), buffer, buffer_length) == -1)
+ {
+ std::cerr << "Could not write to log file." << std::endl;
+ syslog(LOG_EMERG, "gearmand could not open log file %s, got error %s", filename.c_str(), strerror(errno));
+ }
- }
+ }
- if (opt_syslog)
- {
- syslog(int(verbose), "%7s %s", verbose_name(verbose), mesg);
+ if (opt_syslog)
+ {
+ syslog(int(verbose), "%7s %.*s", verbose_name(verbose), mesg_length, mesg);
+ }
}
}