projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Fix valgrind issues.
[awesomized/libmemcached]
/
libtest
/
server.cc
diff --git
a/libtest/server.cc
b/libtest/server.cc
index 0fd1bbf366bbce0465d6e03cf37b95a0545e6809..c29d8c4338b9a4c3ed2f565526611827d9a8010e 100644
(file)
--- a/
libtest/server.cc
+++ b/
libtest/server.cc
@@
-132,7
+132,11
@@
bool Server::start()
Error << "Could not kill() existing server during start() pid:" << _pid;
return false;
}
Error << "Could not kill() existing server during start() pid:" << _pid;
return false;
}
- assert(not has_pid());
+
+ if (has_pid() == false)
+ {
+ fatal_message("has_pid() failed, programer error");
+ }
Application app(name(), is_libtool());
if (args(app) == false)
Application app(name(), is_libtool());
if (args(app) == false)
@@
-141,15
+145,16
@@
bool Server::start()
return false;
}
return false;
}
- if (Application::SUCCESS != app.run())
+ Application::error_t ret;
+ if (Application::SUCCESS != (ret= app.run()))
{
{
- Error << "Application::run()
"
;
+ Error << "Application::run()
" << ret
;
return false;
}
return false;
}
- if (Application::SUCCESS !=
app.wait(
))
+ if (Application::SUCCESS !=
(ret= app.wait()
))
{
{
- Error << "Application::wait()
"
;
+ Error << "Application::wait()
" << ret
;
return false;
}
return false;
}