← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/syslog/logging.cc

  • Committer: Lee Bieber
  • Date: 2011-01-10 20:12:43 UTC
  • mfrom: (2069.1.3 build)
  • Revision ID: kalebral@gmail.com-20110110201243-j7xse6v4ptaipc92
Merge Gustaf - Use constrained_check<> classes on kernel sysvars 
Merge Andrew - fix bug 645004: libuuid configure error message needs changing
Merge Stewart - fix bug 698315: innobase tests fail with --repeat=2

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/syslog/logging.cc
18
18
 *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
19
19
 */
20
20
 
21
 
#include <config.h>
 
21
#include "config.h"
22
22
 
23
23
#include <stdarg.h>
24
24
#include <limits.h>
51
51
{
52
52
  if (_facility < 0)
53
53
  {
54
 
    drizzled::errmsg_printf(drizzled::error::WARN,
 
54
    drizzled::errmsg_printf(ERRMSG_LVL_WARN,
55
55
                            _("syslog facility \"%s\" not known, using \"local0\""),
56
56
                            facility.c_str());
57
57
    _facility= WrapSyslog::getFacilityByName("local0");
59
59
 
60
60
  if (_priority < 0)
61
61
  {
62
 
    drizzled::errmsg_printf(drizzled::error::WARN,
 
62
    drizzled::errmsg_printf(ERRMSG_LVL_WARN,
63
63
                            _("syslog priority \"%s\" not known, using \"info\""),
64
64
                            priority.c_str());
65
65
    _priority= WrapSyslog::getPriorityByName("info");
106
106
         schema->empty() ? "" : schema->c_str(),
107
107
         (int) query_string->length(), 
108
108
         query_string->empty() ? "" : query_string->c_str(),
109
 
         (int) drizzled::getCommandName(session->command).size(),
110
 
         drizzled::getCommandName(session->command).c_str(),
 
109
         (int) drizzled::command_name[session->command].length,
 
110
         drizzled::command_name[session->command].str,
111
111
         (unsigned long long) (t_mark - session->getConnectMicroseconds()),
112
112
         (unsigned long long) (session->getElapsedTime()),
113
113
         (unsigned long long) (t_mark - session->utime_after_lock),