← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/logging_gearman/logging_gearman.cc

  • Committer: Brian Aker
  • Date: 2011-01-11 20:32:48 UTC
  • mto: This revision was merged to the branch mainline in revision 2075.
  • Revision ID: brian@tangent.org-20110111203248-0kyusqlkqd2xqvs7
Cleanup issue of OR in tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/logging_gearman/logging_gearman.cc
24
24
#include <drizzled/plugin/logging.h>
25
25
#include <drizzled/gettext.h>
26
26
#include <drizzled/session.h>
27
 
#include <drizzled/errmsg_print.h>
28
27
#include <boost/date_time.hpp>
29
28
#include <boost/program_options.hpp>
30
29
#include <drizzled/module/option_map.h>
182
181
 
183
182
    if (gearman_client_create(&_gearman_client) == NULL)
184
183
    {
185
 
      drizzled::sql_perror(_("fail gearman_client_create()"));
 
184
      char errmsg[STRERROR_MAX];
 
185
      strerror_r(errno, errmsg, sizeof(errmsg));
 
186
      drizzled::errmsg_printf(ERRMSG_LVL_ERROR, _("fail gearman_client_create(): %s"),
 
187
                              errmsg);
186
188
      return;
187
189
    }
188
190
 
192
194
                                   host.c_str(), 0);
193
195
    if (ret != GEARMAN_SUCCESS)
194
196
    {
195
 
      drizzled::errmsg_printf(drizzled::error::ERROR, _("fail gearman_client_add_server(): %s"),
 
197
      drizzled::errmsg_printf(ERRMSG_LVL_ERROR, _("fail gearman_client_add_server(): %s"),
196
198
                              gearman_client_error(&_gearman_client));
197
199
      return;
198
200
    }
249
251
               (int)dbs->size(), dbs->c_str(),
250
252
               // do need to quote the query
251
253
               quotify((const unsigned char *)session->getQueryString()->c_str(), session->getQueryString()->length(), qs, sizeof(qs)),
252
 
               // getCommandName is defined in drizzled/sql_parse.h dont
253
 
               // need to quote the command name, always CSV safe
254
 
               (int)drizzled::getCommandName(session->command).size(),
255
 
               drizzled::getCommandName(session->command).c_str(),
 
254
               // command_name is defined in drizzled/sql_parse.cc
 
255
               // dont need to quote the command name, always CSV safe
 
256
               (int)drizzled::command_name[session->command].length,
 
257
               drizzled::command_name[session->command].str,
256
258
               // counters are at end, to make it easier to add more
257
259
               (t_mark - session->getConnectMicroseconds()),
258
260
               (session->getElapsedTime()),
297
299
{
298
300
  context("host",
299
301
          po::value<std::string>()->default_value("localhost"),
300
 
          _("Hostname for logging to a Gearman server"));
 
302
          N_("Hostname for logging to a Gearman server"));
301
303
  context("function",
302
304
          po::value<std::string>()->default_value("drizzlelog"),
303
 
          _("Gearman Function to send logging to"));
 
305
          N_("Gearman Function to send logging to"));
304
306
}
305
307
 
306
308
} /* namespace drizzle_plugin */