← Back to branch summary

~ubuntu-branches/ubuntu/trusty/drizzle/trusty

« back to all changes in this revision

Viewing changes to drizzled/plugin/listen_tcp.cc

  • Committer: Bazaar Package Importer
  • Author(s): Monty Taylor
  • Date: 2010-10-02 14:17:48 UTC
  • mfrom: (1.1.1 upstream)
  • mto: (2.1.17 sid)
  • mto: This revision was merged to the branch mainline in revision 3.
  • Revision ID: james.westby@ubuntu.com-20101002141748-m6vbfbfjhrw1153e
Tags: 2010.09.1802-1
* New upstream release.
* Removed pid-file argument hack.
* Updated GPL-2 address to be new address.
* Directly copy in drizzledump.1 since debian doesn't have sphinx 1.0 yet.
* Link to jquery from libjs-jquery. Add it as a depend.
* Add drizzled.8 symlink to the install files.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/plugin/listen_tcp.cc
23
23
#include <drizzled/plugin/listen_tcp.h>
24
24
#include <drizzled/errmsg_print.h>
25
25
 
 
26
#include <cstdio>
26
27
#include <unistd.h>
27
28
#include <sys/socket.h>
28
29
#include <fcntl.h>
192
193
        break;
193
194
      }
194
195
 
195
 
      errmsg_printf(ERRMSG_LVL_INFO, _("Retrying bind() on %u"), getPort());
 
196
      errmsg_printf(ERRMSG_LVL_INFO, _("Retrying bind() on %u\n"), getPort());
196
197
      this_wait= retry * retry / 3 + 1;
197
198
      sleep(this_wait);
198
199
    }
199
200
 
200
201
    if (ret < 0)
201
202
    {
202
 
      errmsg_printf(ERRMSG_LVL_ERROR, _("bind() failed with errno: %d"),
 
203
      errmsg_printf(ERRMSG_LVL_ERROR, _("bind() failed with errno: %d\n"),
203
204
                    errno);
204
205
      errmsg_printf(ERRMSG_LVL_ERROR,
205
 
                    _("Do you already have another drizzled running?"));
 
206
                    _("Do you already have another drizzled running?\n"));
206
207
      return true;
207
208
    }
208
209
 
209
210
    if (listen(fd, (int) back_log) < 0)
210
211
    {
211
212
      errmsg_printf(ERRMSG_LVL_ERROR,
212
 
                    _("listen() failed with errno %d"), errno);
 
213
                    _("listen() failed with errno %d\n"), errno);
213
214
      return true;
214
215
    }
215
216