X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libtest%2Ffatal.cc;h=1187292ba9e819e322ecaa8eeaec1059e3653f8c;hb=81204a653b40f87ae9f43fd8ee12cc8177021f3a;hp=288d53a4b1ccd6f3f487406d3593c9578c6bfdb6;hpb=5c09a7ed2edbb9876493f30d59433331b63f6bfc;p=awesomized%2Flibmemcached

diff --git a/libtest/fatal.cc b/libtest/fatal.cc
index 288d53a4..1187292b 100644
--- a/libtest/fatal.cc
+++ b/libtest/fatal.cc
@@ -54,7 +54,7 @@ fatal::fatal(const char *file_arg, int line_arg, const char *func_arg, const cha
 
     strncpy(_mesg, last_error, sizeof(_mesg));
 
-    snprintf(_error_message, sizeof(_error_message), "%s:%d FATAL:%s (%s)", _file, _line, last_error, _func);
+    snprintf(_error_message, sizeof(_error_message), "%.*s", last_error_length, last_error);
   }
 
 static bool _disabled= false;
@@ -86,7 +86,7 @@ void fatal::increment_disabled_counter()
 }
 
 disconnected::disconnected(const char *file_arg, int line_arg, const char *func_arg,
-                           const char *instance, const in_port_t port,
+                           const std::string& instance, const in_port_t port,
                            const char *format, ...) :
   std::runtime_error(func_arg),
   _port(port),
@@ -94,14 +94,13 @@ disconnected::disconnected(const char *file_arg, int line_arg, const char *func_
   _file(file_arg),
   _func(func_arg)
 {
-  strncpy(_instance, instance, sizeof(_instance));
   va_list args;
   va_start(args, format);
   char last_error[BUFSIZ];
   (void)vsnprintf(last_error, sizeof(last_error), format, args);
   va_end(args);
 
-  snprintf(_error_message, sizeof(_error_message), "%s:%d FATAL:%s (%s)", _file, _line, last_error, _func);
+  snprintf(_error_message, sizeof(_error_message), "%s:%u %s", instance.c_str(), uint32_t(port), last_error);
 }
 
 } // namespace libtest