~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/main.cc

  • Committer: Monty Taylor
  • Date: 2011-02-15 03:57:13 UTC
  • mfrom: (2168.1.7 build)
  • Revision ID: mordred@inaugust.com-20110215035713-w41jt6izr5r8e8lq
Merge Haildb fixes from Stewart and various small build cleanups from Monty.

Show diffs side-by-side

added added

removed removed

Lines of Context:
67
67
#include <drizzled/unireg.h>
68
68
#include <drizzled/util/backtrace.h>
69
69
#include <drizzled/current_session.h>
70
 
 
71
 
extern "C" int daemonize(int nochdir, int noclose, int wait_sigusr1);
72
 
extern "C" int daemon_is_ready(void);
 
70
#include <drizzled/daemon.h>
73
71
 
74
72
using namespace drizzled;
75
73
using namespace std;
262
260
    {
263
261
      perror("Failed to ignore SIGHUP");
264
262
    }
265
 
    if (daemonize(1, 1, 1) == -1)
 
263
    if (daemonize())
266
264
    {
267
265
      fprintf(stderr, "failed to daemon() in order to daemonize\n");
268
266
      exit(EXIT_FAILURE);