projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge in libtest.
[m6w6/libmemcached]
/
libtest
/
server.cc
diff --git
a/libtest/server.cc
b/libtest/server.cc
index c1d01c749e4d3353d32a63301904385448cd3dd1..a57b44d5ca7f0dcecc48947b46793a127dcd86a0 100644
(file)
--- a/
libtest/server.cc
+++ b/
libtest/server.cc
@@
-25,12
+25,14
@@
#include <cassert>
#include <cerrno>
#include <cassert>
#include <cerrno>
+#include <climits>
#include <cstdlib>
#include <iostream>
#include <algorithm>
#include <functional>
#include <locale>
#include <cstdlib>
#include <iostream>
#include <algorithm>
#include <functional>
#include <locale>
+#include <unistd.h>
// trim from end
static inline std::string &rtrim(std::string &s)
// trim from end
static inline std::string &rtrim(std::string &s)
@@
-159,11
+161,16
@@
bool Server::start()
}
#endif
}
#endif
- if (getenv("YATL_VALGRIND_SERVER"))
+ if (getenv("YATL_PTRCHECK_SERVER"))
+ {
+ _app.use_ptrcheck();
+ }
+ else if (getenv("YATL_VALGRIND_SERVER"))
{
_app.use_valgrind();
}
{
_app.use_valgrind();
}
- else if (args(_app) == false)
+
+ if (args(_app) == false)
{
Error << "Could not build command()";
return false;
{
Error << "Could not build command()";
return false;
@@
-199,6
+206,12
@@
bool Server::start()
throw libtest::fatal(LIBYATL_DEFAULT_PARAM,
"Unable to open pidfile for: %s",
_running.c_str());
throw libtest::fatal(LIBYATL_DEFAULT_PARAM,
"Unable to open pidfile for: %s",
_running.c_str());
+ char buf[PATH_MAX];
+ getcwd(buf, sizeof(buf));
+ throw libtest::fatal(LIBYATL_DEFAULT_PARAM,
+ "Unable to open pidfile in %s for: %s",
+ buf,
+ _running.c_str());
}
}
}
}
}
}
@@
-319,8
+332,7
@@
bool Server::set_pid_file()
int fd;
if ((fd= mkstemp(file_buffer)) == -1)
{
int fd;
if ((fd= mkstemp(file_buffer)) == -1)
{
- perror(file_buffer);
- return false;
+ throw libtest::fatal(LIBYATL_DEFAULT_PARAM, "mkstemp() failed on %s with %s", file_buffer, strerror(errno));
}
close(fd);
unlink(file_buffer);
}
close(fd);
unlink(file_buffer);