← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/rabbitmq/rabbitmq_log.cc

  • Committer: Brian Aker
  • Date: 2011-02-01 02:51:01 UTC
  • mto: (2132.1.1 drizzle-build)
  • mto: This revision was merged to the branch mainline in revision 2134.
  • Revision ID: brian@tangent.org-20110201025101-yaj5kkdk2towo6ou
Merge in error message rework. Many error messages are fixed in this patch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/rabbitmq/rabbitmq_log.cc
69
69
  uint8_t* buffer= new uint8_t[message_byte_length];
70
70
  if(buffer == NULL)
71
71
  {
72
 
    errmsg_printf(ERRMSG_LVL_ERROR, _("Failed to allocate enough memory to transaction message\n"));
 
72
    errmsg_printf(error::ERROR, _("Failed to allocate enough memory to transaction message\n"));
73
73
    deactivate();
74
74
    return plugin::UNKNOWN_ERROR;
75
75
  }
84
84
  }
85
85
  catch(exception& e)
86
86
  {
87
 
    errmsg_printf(ERRMSG_LVL_ERROR, _(e.what()));
 
87
    errmsg_printf(error::ERROR, _(e.what()));
88
88
    deactivate();
89
89
    return plugin::UNKNOWN_ERROR;
90
90
  }
114
114
  } 
115
115
  catch (exception& e) 
116
116
  {
117
 
    errmsg_printf(ERRMSG_LVL_ERROR, _("Failed to allocate the RabbitMQHandler.  Got error: %s\n"),
 
117
    errmsg_printf(error::ERROR, _("Failed to allocate the RabbitMQHandler.  Got error: %s\n"),
118
118
                  e.what());
119
119
    return 1;
120
120
  }
127
127
  } 
128
128
  catch (exception& e) 
129
129
  {
130
 
    errmsg_printf(ERRMSG_LVL_ERROR, _("Failed to allocate the RabbitMQLog instance.  Got error: %s\n"), 
 
130
    errmsg_printf(error::ERROR, _("Failed to allocate the RabbitMQLog instance.  Got error: %s\n"), 
131
131
                  e.what());
132
132
    return 1;
133
133
  }