Merge branch 'binlog'

.gitignore

@@ -28,3 +28,4 @@ tests/cutcheck*
 tests/cutgen
 stamp-h1
 version.h
+.*.swp

Makefile.am

@@ -12,11 +12,12 @@ beanstalkd_SOURCES = beanstalkd.c \
  primes.c \
  prot.c \
  tube.c \
+ binlog.c \
  util.c
 
 cutgen_CFLAGS = -D__LINUX__
 
-EXTRA_DIST = conn.h job.h ms.h net.h pq.h primes.h prot.h stat.h tube.h util.h
+EXTRA_DIST = conn.h job.h ms.h net.h pq.h primes.h prot.h stat.h tube.h util.h binlog.h
 
 tests = $(abs_srcdir)/tests/test_conn.c \
  $(abs_srcdir)/tests/test_job.c \

beanstalkd.c

@@ -34,6 +34,7 @@
 #include "util.h"
 #include "prot.h"
 #include "version.h"
+#include "binlog.h"
 
 static char *user = NULL;
 static int detach = 0;
@@ -93,6 +94,7 @@ su(const char *user) {
 void
 exit_cleanly(int sig)
 {
+ binlog_close();
  exit(0);
 }
 
@@ -153,6 +155,7 @@ usage(char *msg, char *arg)
  "\n"
  "Options:\n"
  " -d detach\n"
+ " -b DIR binlog directory\n"
  " -l ADDR listen on address (default is 0.0.0.0)\n"
  " -p PORT listen on port (default is 11300)\n"
  " -u USER become user and group\n"
@@ -225,6 +228,9 @@ opts(int argc, char **argv)
  case 'u':
  user = argv[++i];
  break;
+ case 'b':
+ binlog_dir = argv[++i];
+ break;
  case 'h':
  usage(NULL, NULL);
  case 'v':
@@ -257,8 +263,11 @@ main(int argc, char **argv)
  nudge_fd_limit();
 
  unbrake((evh) h_accept);
+ prot_replay_binlog();
+ binlog_init();
 
  event_dispatch();
+ binlog_close();
  twarnx("got here for some reason");
  return 0;
 }