← Back to branch summary

~brianaker/libmemcached/merge-1.0-april-2013

« back to all changes in this revision

Viewing changes to libtest/server.cc

  • Committer: Continuous Integration
  • Date: 2013-01-14 21:10:11 UTC
  • mfrom: (1094.1.2 libmemcached-1.2)
  • Revision ID: ci@tangent.org-20130114211011-qql124fta45s730w
Merge lp:~tangent-org/libmemcached/1.2-build/ Build: jenkins-Libmemcached-199

Show diffs side-by-side

added added

removed removed

Lines of Context:
libtest/server.cc
124
124
 
125
125
Server::~Server()
126
126
{
127
 
  kill();
 
127
  murder();
128
128
}
129
129
 
130
130
bool Server::check()
148
148
  while (--limit and 
149
149
         is_pid_valid(_app.pid()))
150
150
  {
151
 
    if (kill())
 
151
    if (murder())
152
152
    {
153
153
      Log << "Killed existing server," << *this;
154
154
      dream(0, 50000);
498
498
  return true;
499
499
}
500
500
 
501
 
bool Server::kill()
 
501
bool Server::murder()
502
502
{
503
503
  if (check_pid(_app.pid())) // If we kill it, reset
504
504
  {