Add "--checksum" in rsync when using "--force"

If the user don't put that option in rsync_options using of "--force" could be unsafe. While the probability of failures because of this are low they aren't zero.
Options -F -I -v doesn't accept arguments, which means that on
2026-03-23 07:06:30 +00:00 · 2015-02-10 20:44:34 -05:00 · 2013-01-13 16:40:08 -05:00 · 2012-12-11 11:54:35 -05:00 · 2012-09-15 17:44:03 -05:00 · 2012-09-15 17:41:42 -05:00
45 changed files with 3087 additions and 12796 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,6 @@
 *~
 *.o
-*.so
 repmgr
 repmgrd
 README.htm*
 README.pdf
-sql/repmgr_funcs.so
-sql/repmgr_funcs.sql
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,29 +0,0 @@
-License and Contributions
-=========================
-
-`repmgr` is licensed under the GPL v3.  All of its code and documentation is
-Copyright 2010-2016, 2ndQuadrant Limited.  See the files COPYRIGHT and LICENSE for
-details.
-
-The development of repmgr has primarily been sponsored by 2ndQuadrant customers.
-
-Additional work has been sponsored by the 4CaaST project for cloud computing,
-which has received funding from the European Union's Seventh Framework Programme
-(FP7/2007-2013) under grant agreement 258862.
-
-Contributions to `repmgr` are welcome, and will be listed in the file `CREDITS`.
-2ndQuadrant Limited requires that any contributions provide a copyright
-assignment and a disclaimer of any work-for-hire ownership claims from the
-employer of the developer.  This lets us make sure that all of the repmgr
-distribution remains free code.  Please contact info@2ndQuadrant.com for a
-copy of the relevant Copyright Assignment Form.
-
-Code style
----------
-
-Code in repmgr is formatted to a consistent style using the following command:
-
-    astyle --style=ansi --indent=tab --suffix=none *.c *.h
-
-Contributors should reformat their code similarly before submitting code to
-the project, in order to minimize merge conflicts with other work.
--- a/2
+++ b/2
@@ -1,4 +1,4 @@
-Copyright (c) 2010-2016, 2ndQuadrant Limited
+Copyright (c) 2010-2011, 2ndQuadrant Limited
 All rights reserved.

 This program is free software: you can redistribute it and/or modify
--- a/6
+++ b/6
@@ -10,7 +10,5 @@ Hannu Krosing <hannu@2ndQuadrant.com>
 Cédric Villemain <cedric@2ndquadrant.com>
 Charles Duffy <charles@dyfis.net>
 Daniel Farina <daniel@heroku.com>
-Shawn Ellis <shawn.ellis17@gmail.com>
-Jay Taylor <jay@jaytaylor.com>
-Christian Kruse <christian@2ndQuadrant.com>
-Krzysztof Gajdemski <songo@debian.org.pl>
+Marco Nenciarini <marco.nenciarini@2ndquadrant.it>
+Carlo Ascani <carlo.ascani@2ndquadrant.it>
--- a/FAILOVER.rst
+++ b/FAILOVER.rst
@@ -1 +0,0 @@
-The contents of this file have been incorporated into the main README.md document.
--- a/FAQ.md
+++ b/FAQ.md
@@ -1,171 +0,0 @@
-FAQ - Frequently Asked Questions about repmgr
-=============================================
-
-This FAQ applies to `repmgr` 3.0 and later.
-
-General
-------
-
- What's the difference between the repmgr versions?
-
-  repmgr 3.x builds on the improved replication facilities added
-  in PostgreSQL 9.3, as well as improved automated failover support
-  via `repmgrd`, and is not compatible with PostgreSQL 9.2 and earlier.
-
-  repmgr 2.x supports PostgreSQL 9.0 onwards. While it is compatible
-  with  PostgreSQL 9.3 and later, we recommend repmgr v3.
-
- What's the advantage of using replication slots?
-
-  Replication slots, introduced in PostgreSQL 9.4, ensure that the
-  master server will retain WAL files until they have been consumed
-  by all standby servers. This makes WAL file management much easier,
-  and if used `repmgr` will no longer insist on a fixed number (default: 5000)
-  of WAL files being preserved.
-
-  (However this does mean that if a standby is no longer connected to the
-  master, the master will retain WAL files indefinitely).
-
- How many replication slots should I define in `max_replication_slots`?
-
-  Normally at least same number as the number of standbys which will connect
-  to the node. Note that changes to `max_replication_slots` require a server
-  restart to take effect, and as there is no particular penalty for unused
-  replication slots, setting a higher figure will make adding new nodes
-  easier.
-
- Does `repmgr` support hash indexes?
-
-  No. Hash indexes and replication do not mix well and their use is
-  explicitly discouraged; see:
-    http://www.postgresql.org/docs/current/interactive/sql-createindex.html#AEN74175
-
-`repmgr`
--------
-
- When should I use the --rsync-only option?
-
-  By default, `repmgr` uses `pg_basebackup` to clone a standby from
-  a master. However, `pg_basebackup` copies the entire data directory, which
-  can take some time depending on installation size. If you have an
-  existing but "stale" standby, `repmgr` can use `rsync` instead,
-  which means only changed or added files need to be copied.
-
- Can I register an existing master/standby?
-
-  Yes, this is no problem.
-
- How can a failed master be re-added as a standby?
-
-  This is a two-stage process. First, the failed master's data directory
-  must be re-synced with the current master; secondly the failed master
-  needs to be re-registered as a standby. The section "Converting a failed
-  master to a standby" in the `README.md` file contains more detailed
-  information on this process.
-
- Is there an easy way to check my master server is correctly configured
-  for use with `repmgr`?
-
-  Yes - execute `repmgr` with the `--check-upstream-config` option, and it
-  will let you know which items in `postgresql.conf` need to be modified.
-
- Even though I specified custom `rsync` options, `repmgr` appends
-  the `--checksum` - why?
-
-  When syncing a stale data directory from an active server, it's
-  essential that `rsync` compares the content of files rather than
-  just timestamp and size, to ensure that all changed files are
-  copied and prevent corruption.
-
- When cloning a standby, how can I prevent `repmgr` from copying
-  `postgresql.conf` and `pg_hba.conf` from the PostgreSQL configuration
-  directory in `/etc`?
-
-  Use the command line option `--ignore-external-config-files`
-
- How can I prevent `repmgr` from copying local configuration files
-  in the data directory?
-
-  If you're updating an existing but stale data directory which
-  contains e.g. configuration files you don't want to be overwritten
-  with the same file from the master, specify the files in the
-  `rsync_options` configuration option, e.g.
-
-      rsync_options=--exclude=postgresql.local.conf
-
-  This option is only available when using the `--rsync-only` option.
-
- How can I make the witness server use a particular port?
-
-  By default the witness server is configured to use port 5499; this
-  is intended to support running the witness server as  a separate
-  instance on a normal node server, rather than on its own dedicated server.
-
-  To specify different port for the witness server, supply the port number
-  in the `conninfo` string in `repmgr.conf`
-  (repmgr 3.0.1 and earlier: use the `-l/--local-port` option)
-
- Do I need to include `shared_preload_libraries = 'repmgr_funcs'`
-  in `postgresql.conf` if I'm not using `repmgrd`?
-
-  No, the `repmgr_funcs` library is only needed when running `repmgrd`.
-  If you later decide to run `repmgrd`, you just need to add
-  `shared_preload_libraries = 'repmgr_funcs'` and restart PostgreSQL.
-
- I've provided replication permission for the `repmgr` user in `pg_hba.conf`
-  but `repmgr`/`repmgrd` complains it can't connect to the server... Why?
-
-  `repmgr`/`repmgrd` need to be able to connect to the repmgr database
-  with a normal connection to query metadata. The `replication` connection
-  permission is for PostgreSQL's streaming replication and doesn't
-  necessarily need to be the `repmgr` user.
-
- When cloning a standby, why do I need to provide the connection parameters
-  for the primary server on the command line, not in the configuration file?
-
-  Cloning a standby is a one-time action; the role of the server being cloned
-  from could change, so fixing it in the configuration file would create
-  confusion. If `repmgr` needs to establish a connection to the primary
-  server, it can retrieve this from the `repl_nodes` table or if necessary
-  scan the replication cluster until it locates the active primary.
-
- Why is there no foreign key on the `node_id` column in the `repl_events`
-  table?
-
-  Under some circumstances event notifications can be generated for servers
-  which have not yet been registered; it's also useful to retain a record
-  of events which includes servers removed from the replication cluster
-  which no longer have an entry in the `repl_nodes` table.
-
-`repmgrd`
---------
-
- Do I need a witness server?
-
-  Not necessarily. However if you have an uneven number of nodes spread
-  over more than one network segment, a witness server will enable
-  better handling of a 'split brain' situation by providing a "casting
-  vote" on the preferred network segment.
-
- How can I prevent a node from ever being promoted to master?
-
-  In `repmgr.conf`, set its priority to a value of 0 or less.
-
- Does `repmgrd` support delayed standbys?
-
-  `repmgrd` can monitor delayed standbys - those set up with
-  `recovery_min_apply_delay` set to a non-zero value in `recovery.conf` -
-  but as it's not currently possible to directly examine the value
-  applied to the standby, `repmgrd` may not be able to properly evaluate
-  the node as a promotion candidate.
-
-  We recommend that delayed standbys are explicitly excluded from promotion
-  by setting `priority` to 0 in `repmgr.conf`.
-
-  Note that after registering a delayed standby, `repmgrd` will only start
-  once the metadata added in the master node has been replicated.
-
- How can I get `repmgrd` to rotate its logfile?
-
-  Configure your system's `logrotate` service to do this; see example
-  in README.md
--- a/125
+++ b/125
@@ -1,128 +1,15 @@
-3.1.1   2016-02-
-        Add '-P/--pwprompt' option for "repmgr create witness" (Ian)
-        Prevent repmgr/repmgrd running as root (Ian)
-
-3.1.0   2016-02-01
-        Add "repmgr standby switchover" command (Ian)
-        Revised README file (Ian)
-        Remove requirement for 'archive_mode' to be enabled (Ian)
-        Improve -?/--help output, showing default values if relevant (Ian)
-        Various bugfixes to command line/configuration parameter handling (Ian)
-
-3.0.3   2016-01-04
-        Create replication slot if required before base backup is run (Abhijit)
-        standy clone: when using rsync, clean up "pg_replslot" directory (Ian)
-        Improve --help output (Ian)
-        Improve config file parsing (Ian)
-        Various logging output improvements, including explicit HINTS (Ian)
-        Add --log-level to explicitly set log level on command line (Ian)
-        Repurpose --verbose to display extra log output (Ian)
-        Add --terse to hide hints and other non-critical output (Ian)
-        Reference internal functions with explicit catalog path (Ian)
-        When following a new primary, have repmgr (not repmgrd) create the new slot (Ian)
-        Add /etc/repmgr.conf as a default configuration file location (Ian)
-        Prevent repmgrd's -v/--verbose option expecting a parameter (Ian)
-        Prevent invalid replication_lag values being written to the monitoring table (Ian)
-        Improve repmgrd behaviour when monitored standby node is temporarily
-          unavailable (Martín)
-
-3.0.2   2015-10-02
-        Improve handling of --help/--version options; and improve help output (Ian)
-        Improve handling of situation where logfile can't be opened (Ian)
-        Always pass -D/--pgdata option to pg_basebackup (Ian)
-        Bugfix: standby clone --force does not empty pg_xlog (Gianni)
-        Bugfix: autofailover with reconnect_attempts > 1 (Gianni)
-        Bugfix: ignore comments after values (soxwellfb)
-        Bugfix: handle string values in 'node' parameter correctly (Gregory Duchatelet)
-        Allow repmgr to be compiled with a newer libpq (Marco)
-        Bugfix: call update_node_record_set_upstream() for STANDBY FOLLOW (Tomas)
-        Update `repmgr --help` output (per Github report from renard)
-        Update tablespace remapping in --rsync-only mode for 9.5 and later (Ian)
-        Deprecate `-l/--local-port` option - the port can be extracted
-          from the conninfo string in repmgr.conf (Ian)
-        Add STANDBY UNREGISTER (Vik Fearing)
-        Don't fail with error when registering master if schema already defined (Ian)
-        Fixes to whitespace handling when parsing config file (Ian)
-
-3.0.1   2015-04-16
-        Prevent repmgrd from looping infinitely if node was not registered (Ian)
-        When promoting a standby, have repmgr (not repmgrd) handle metadata updates (Ian)
-        Re-use replication slot if it already exists (Ian)
-        Prevent a test SSH connection being made when not needed (Ian)
-        Correct monitoring table column names (Ian)
-
-3.0     2015-03-27
-        Require PostgreSQL 9.3 or later (Ian)
-        Use `pg_basebackup` by default (instead of `rsync`) to clone standby servers (Ian)
-        Use `pg_ctl promote` to promote a standby to primary
-        Enable tablespace remapping using `pg_basebackup` (in PostgreSQL 9.3 with `rsync`) (Ian)
-        Support cascaded standbys (Ian)
-        "pg_bindir" no longer required as a configuration parameter (Ian)
-        Enable replication slots to be used (PostgreSQL 9.4 and later (Ian)
-        Command line option "--check-upstream-config" (Ian)
-        Add event logging table and option to execute an external program when an event occurs (Ian)
-        General usability and logging message improvements (Ian)
-        Code consolidation and cleanup (Ian)
-
-2.0.3   2015-04-16
-        Add -S/--superuser option for witness database creation Ian)
-        Add -c/--fast-checkpoint option for cloning (Christoph)
-        Add option "--initdb-no-pwprompt" (Ian)
-
-2.0.2   2015-02-17
-        Add "--checksum" in rsync when using "--force" (Jaime)
-        Use createdb/createuser instead of psql (Jaime)
-        Fixes to witness creation and monitoring (wamonite)
-        Use default master port if none supplied (Martín)
-        Documentation fixes and improvements (Ian)
-
-2.0.1   2014-07-16
-        Documentation fixes and new QUICKSTART file (Ian)
-        Explicitly specify directories to ignore when cloning (Ian)
-        Fix log level for some log messages (Ian)
-        RHEL/CentOS specfile, init script and Makefile fixes (Nathan Van Overloop)
-        Debian init script and config file documentation fixes (József Kószó)
-        Typo fixes (Riegie Godwin Jeyaranchen, PriceChild)
-
-2.0stable 2014-01-30
-        Documentation fixes (Christian)
-        General refactoring, code quality improvements and stabilization work (Christian)
-        Added proper daemonizing (-d/--daemonize) (Christian)
-        Added PID file handling (-p/--pid-file) (Christian)
-        New config option: monitor_interval_secs (Christian)
-        New config option: retry_promote_interval (Christian)
-        New config option: logfile (Christian)
-        New config option: pg_bindir (Christian)
-        New config option: pgctl_options (Christian)
-
-2.0beta2 2013-12-19
-        Improve autofailover logic and algorithms (Jaime, Andres)
-        Ignore pg_log when cloning (Jaime)
-        Add timestamps to log line in stderr (Christian)
-        Correctly check wal_keep_segments (Jay Taylor)
-        Add a ssh_options parameter (Jay Taylor)
-
-2.0beta1 2012-07-27
-        Make CLONE command try to make an exact copy including $PGDATA location (Cedric) 
-        Add detection of master failure (Jaime)
-        Add the notion of a witness server (Jaime)
-        Add autofailover capabilities (Jaime)
-        Add a configuration parameter to indicate the script to execute on failover or follow (Jaime)
-        Make the monitoring optional and turned off by default, it can be turned on with --monitoring-history switch (Jaime)
-        Add tunables to specify number of retries to reconnect to master and the time between them (Jaime)
-
-1.2.0   2012-07-27
-        Test ssh connection before trying to rsync (Cédric)
+1.2.0	2012-07-27
+		Test ssh connection before trying to rsync (Cédric)
        Add CLUSTER SHOW command (Carlo)
        Add CLUSTER CLEANUP command (Jaime)
        Add function write_primary_conninfo (Marco)
        Teach repmgr how to get tablespace's location in different pg version (Jaime)
-        Improve version message (Carlo)
+		Improve version message (Carlo)

-1.1.1   2012-04-18
+1.1.1	2012-04-18
        Add --ignore-rsync-warning (Cédric)
        Add strnlen for compatibility with OS X (Greg)
-        Improve performance of the repl_status view (Jaime)
+        Improve performance of repl_status view (Jaime) 
        Remove last argument from log_err (Jaime, Reported by Jeroen Dekkers)
        Complete documentation about possible error conditions (Jaime)
        Document how to clean history (Jaime)
@@ -130,7 +17,7 @@
 1.1.0   2011-03-09
        Make options -U, -R and -p not mandatory (Jaime)

-1.1.0b1 2011-02-24
+1.1.0b1 2011-02-24 
        Fix missing "--force" option in help (Greg Smith)
        Correct warning message for wal_keep_segments (Bas van Oostveen)
        Add Debian build/usage docs (Bas, Hannu Krosing, Cedric Villemain)
--- a/45
+++ b/45
@@ -1,6 +1,6 @@
 #
 # Makefile
-# Copyright (c) 2ndQuadrant, 2010-2016
+# Copyright (c) 2ndQuadrant, 2010-2011

 repmgrd_OBJS = dbutils.o config.o repmgrd.o log.o strutil.o
 repmgr_OBJS = dbutils.o check_dir.o config.o repmgr.o log.o strutil.o
@@ -11,18 +11,15 @@ PG_CPPFLAGS = -I$(libpq_srcdir)
 PG_LIBS = $(libpq_pgport)

 all:  repmgrd repmgr
-	$(MAKE) -C sql

 repmgrd: $(repmgrd_OBJS)
 	$(CC) $(CFLAGS) $(repmgrd_OBJS) $(PG_LIBS) $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o repmgrd
-	$(MAKE) -C sql

 repmgr: $(repmgr_OBJS)
 	$(CC) $(CFLAGS) $(repmgr_OBJS) $(PG_LIBS) $(LDFLAGS) $(LDFLAGS_EX) $(LIBS) -o repmgr

 ifdef USE_PGXS
-PG_CONFIG = pg_config
-PGXS := $(shell $(PG_CONFIG) --pgxs)
+PGXS := $(shell pg_config --pgxs)
 include $(PGXS)
 else
 subdir = contrib/repmgr
@@ -33,26 +30,9 @@ endif

 # XXX: Try to use PROGRAM construct (see pgxs.mk) someday. Right now
 # is overriding pgxs install.
-install: install_prog install_ext
-
-install_prog:
-	mkdir -p '$(DESTDIR)$(bindir)'
-	$(INSTALL_PROGRAM) repmgrd$(X) '$(DESTDIR)$(bindir)/'
-	$(INSTALL_PROGRAM) repmgr$(X) '$(DESTDIR)$(bindir)/'
-
-install_ext:
-	$(MAKE) -C sql install
-
-install_rhel:
-	mkdir -p '$(DESTDIR)/etc/init.d/'
-	$(INSTALL_PROGRAM) RHEL/repmgrd.init '$(DESTDIR)/etc/init.d/repmgrd'
-	mkdir -p '$(DESTDIR)/etc/sysconfig/'
-	$(INSTALL_PROGRAM) RHEL/repmgrd.sysconfig '$(DESTDIR)/etc/sysconfig/repmgrd'
-	mkdir -p '$(DESTDIR)/etc/repmgr/'
-	$(INSTALL_PROGRAM) repmgr.conf.sample '$(DESTDIR)/etc/repmgr/'
-	mkdir -p '$(DESTDIR)/usr/bin/'
-	$(INSTALL_PROGRAM) repmgrd$(X) '$(DESTDIR)/usr/bin/'
-	$(INSTALL_PROGRAM) repmgr$(X) '$(DESTDIR)/usr/bin/'
+install:
+	$(INSTALL_PROGRAM) repmgrd$(X) '$(DESTDIR)$(bindir)'
+	$(INSTALL_PROGRAM) repmgr$(X) '$(DESTDIR)$(bindir)'

 ifneq (,$(DATA)$(DATA_built))
 	@for file in $(addprefix $(srcdir)/, $(DATA)) $(DATA_built); do \
@@ -65,23 +45,10 @@ clean:
 	rm -f *.o
 	rm -f repmgrd
 	rm -f repmgr
-	$(MAKE) -C sql clean
-
-# Get correct version numbers and install paths, depending on your postgres version
-PG_VERSION = $(shell pg_config --version | cut -d ' ' -f 2 | cut -d '.' -f 1,2)
-REPMGR_VERSION = $(shell grep REPMGR_VERSION version.h | cut -d ' ' -f 3 | cut -d '"' -f 2)
-PKGLIBDIR = $(shell pg_config --pkglibdir)
-SHAREDIR = $(shell pg_config --sharedir)

 deb: repmgrd repmgr
 	mkdir -p ./debian/usr/bin
 	cp repmgrd repmgr ./debian/usr/bin/
-	mkdir -p ./debian$(SHAREDIR)/contrib/
-	cp sql/repmgr_funcs.sql ./debian$(SHAREDIR)/contrib/
-	cp sql/uninstall_repmgr_funcs.sql ./debian$(SHAREDIR)/contrib/
-	mkdir -p ./debian$(PKGLIBDIR)/
-	cp sql/repmgr_funcs.so ./debian$(PKGLIBDIR)/
 	dpkg-deb --build debian
-	mv debian.deb ../postgresql-repmgr-$(PG_VERSION)_$(REPMGR_VERSION).deb
-	rm -rf ./debian/usr
+	mv debian.deb ../postgresql-repmgr-9.0_1.0.0.deb

--- a/PACKAGES.md
+++ b/PACKAGES.md
@@ -1,127 +0,0 @@
-Packaging
-=========
-
-Notes on RedHat Linux, Fedora, and CentOS Builds
------------------------------------------------
-
-The RPM packages of PostgreSQL put `pg_config` into the `postgresql-devel`
-package, not the main server one.  And if you have a RPM install of PostgreSQL
-9.0, the entire PostgreSQL binary directory will not be in your PATH by default
-either.  Individual utilities are made available via the `alternatives`
-mechanism, but not all commands will be wrapped that way.  The files installed
-by repmgr will certainly not be in the default PATH for the postgres user
-on such a system.  They will instead be in /usr/pgsql-9.0/bin/ on this
-type of system.
-
-When building repmgr against a RPM packaged build, you may discover that some
-development packages are needed as well.  The following build errors can
-occur:
-
-    /usr/bin/ld: cannot find -lxslt
-    /usr/bin/ld: cannot find -lpam
-
-Install the following packages to correct those:
-
-
-    yum install libxslt-devel
-    yum install pam-devel
-
-If building repmgr as a regular user, then doing the install into the system
-directories using sudo, the syntax is hard.  `pg_config` won't be in root's
-path either.  The following recipe should work:
-
-    sudo PATH="/usr/pgsql-9.0/bin:$PATH" make USE_PGXS=1 install
-
-
-Issues with 32 and 64 bit RPMs
------------------------------
-
-If when building, you receive a series of errors of this form:
-
-  /usr/bin/ld: skipping incompatible /usr/pgsql-9.0/lib/libpq.so when searching for -lpq
-
-This is likely because you have both the 32 and 64 bit versions of the
-`postgresql90-devel` package installed.  You can check that like this:
-
-    rpm -qa --queryformat '%{NAME}\t%{ARCH}\n'  | grep postgresql90-devel
-
-And if two packages appear, one for i386 and one for x86_64, that's not supposed
-to be allowed.
-
-This can happen when using the PGDG repo to install that package;
-here is an example sessions demonstrating the problem case appearing:
-
-
-    # yum install postgresql-devel
-    ..
-    Setting up Install Process
-    Resolving Dependencies
-    --> Running transaction check
-    ---> Package postgresql90-devel.i386 0:9.0.2-2PGDG.rhel5 set to be updated
-    ---> Package postgresql90-devel.x86_64 0:9.0.2-2PGDG.rhel5 set to be updated
-    --> Finished Dependency Resolution
-
-    Dependencies Resolved
-
-    =========================================================================
-     Package               Arch      Version              Repository    Size
-    =========================================================================
-    Installing:
-     postgresql90-devel    i386      9.0.2-2PGDG.rhel5    pgdg90        1.5 M
-     postgresql90-devel    x86_64    9.0.2-2PGDG.rhel5    pgdg90        1.6 M
-
-
-Note how both the i386 and x86_64 platform architectures are selected for
-installation.  Your main PostgreSQL package will only be compatible with one of
-those, and if the repmgr build finds the wrong postgresql90-devel these
-"skipping incompatible" messages appear.
-
-In this case, you can temporarily remove both packages, then just install the
-correct one for your architecture.  Example:
-
-    rpm -e postgresql90-devel --allmatches
-    yum install postgresql90-devel-9.0.2-2PGDG.rhel5.x86_64
-
-Instead just deleting the package from the wrong platform might not leave behind
-the correct files, due to the way in which these accidentally happen to interact.
-If you already tried to build repmgr before doing this, you'll need to do:
-
-    make USE_PGXS=1 clean
-
-to get rid of leftover files from the wrong architecture.
-
-Notes on Ubuntu, Debian or other Debian-based Builds
----------------------------------------------------
-
-The Debian packages of PostgreSQL put `pg_config` into the development package
-called `postgresql-server-dev-$version`.
-
-When building repmgr against a Debian packages build, you may discover that some
-development packages are needed as well. You will need the following development
-packages installed:
-
-    sudo apt-get install libxslt-dev libxml2-dev libpam-dev libedit-dev
-
-If you're using Debian packages for PostgreSQL and are building repmgr with the
-USE_PGXS option you also need to install the corresponding development package:
-
-    sudo apt-get install postgresql-server-dev-9.0
-
-If you build and install repmgr manually it will not be on the system path. The
-binaries will be installed in /usr/lib/postgresql/$version/bin/ which is not on
-the default path. The reason behind this is that Ubuntu/Debian systems manage
-multiple installed versions of PostgreSQL on the same system through a wrapper
-called pg_wrapper and repmgr is not (yet) known to this wrapper.
-
-You can solve this in many different ways, the most Debian like is to make an
-alternate for repmgr and repmgrd:
-
-    sudo update-alternatives --install /usr/bin/repmgr repmgr /usr/lib/postgresql/9.0/bin/repmgr 10
-    sudo update-alternatives --install /usr/bin/repmgrd repmgrd /usr/lib/postgresql/9.0/bin/repmgrd 10
-
-You can also make a deb package of repmgr using:
-
-    make USE_PGXS=1 deb
-
-This will build a Debian package one level up from where you build, normally the
-same directory that you have your repmgr/ directory in.
--- a/QUICKSTART.md
+++ b/QUICKSTART.md
@@ -1 +0,0 @@
-The contents of this file have been incorporated into the main README.md document.
--- a/README.md
+++ b/README.md
--- a/README.rst
+++ b/README.rst
--- a/RHEL/repmgr3-93.spec
+++ b/RHEL/repmgr3-93.spec
@@ -1,61 +0,0 @@
-Summary: repmgr
-Name: repmgr
-Version: 3.0
-Release: 1
-License: GPLv3
-Group: System Environment/Daemons
-URL: http://repmgr.org
-Packager: Ian Barwick <ian@2ndquadrant.com>
-Vendor: 2ndQuadrant Limited
-Distribution: centos
-Source0: %{name}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-
-%description
-repmgr is a utility suite which greatly simplifies
-the process of setting up and managing replication
-using streaming replication within a cluster of
-PostgreSQL servers.
-
-%prep
-%setup
-
-%build
-export PATH=$PATH:/usr/pgsql-9.3/bin/
-%{__make} USE_PGXS=1
-
-%install
-[ "%{buildroot}" != "/" ] && %{__rm} -rf %{buildroot}
-
-export PATH=$PATH:/usr/pgsql-9.3/bin/
-%{__make} USE_PGXS=1 install DESTDIR=%{buildroot} INSTALL="install -p"
-%{__make} USE_PGXS=1 install_prog DESTDIR=%{buildroot} INSTALL="install -p"
-%{__make} USE_PGXS=1 install_rhel DESTDIR=%{buildroot} INSTALL="install -p"
-
-
-%clean
-[ "%{buildroot}" != "/" ] && %{__rm} -rf %{buildroot}
-
-
-%files
-%defattr(-,root,root)
-/usr/bin/repmgr
-/usr/bin/repmgrd
-/usr/pgsql-9.3/bin/repmgr
-/usr/pgsql-9.3/bin/repmgrd
-/usr/pgsql-9.3/lib/repmgr_funcs.so
-/usr/pgsql-9.3/share/contrib/repmgr.sql
-/usr/pgsql-9.3/share/contrib/repmgr_funcs.sql
-/usr/pgsql-9.3/share/contrib/uninstall_repmgr.sql
-/usr/pgsql-9.3/share/contrib/uninstall_repmgr_funcs.sql
-%attr(0755,root,root)/etc/init.d/repmgrd
-%attr(0644,root,root)/etc/sysconfig/repmgrd
-%attr(0644,root,root)/etc/repmgr/repmgr.conf.sample
-
-%changelog
-* Tue Mar 10 2015 Ian Barwick ian@2ndquadrant.com>
- build for repmgr 3.0
-* Thu Jun 05 2014 Nathan Van Overloop <nathan.van.overloop@nexperteam.be> 2.0.2
- fix witness creation to create db and user if needed
-* Fri Apr 04 2014 Nathan Van Overloop <nathan.van.overloop@nexperteam.be> 2.0.1
- initial build for RHEL6
--- a/RHEL/repmgrd.init
+++ b/RHEL/repmgrd.init
@@ -1,133 +0,0 @@
-#!/bin/sh
-#
-# chkconfig: - 75 16
-# description: Enable repmgrd replication management and monitoring daemon for PostgreSQL
-# processname: repmgrd
-# pidfile="/var/run/${NAME}.pid"
-
-# Source function library.
-INITD=/etc/rc.d/init.d
-. $INITD/functions
-
-# Get function listing for cross-distribution logic.
-TYPESET=`typeset -f|grep "declare"`
-
-# Get network config.
-. /etc/sysconfig/network
-
-DESC="PostgreSQL replication management and monitoring daemon"
-NAME=repmgrd
-
-REPMGRD_ENABLED=no
-REPMGRD_OPTS=
-REPMGRD_USER=postgres
-REPMGRD_BIN=/usr/pgsql-9.3/bin/repmgrd
-REPMGRD_PIDFILE=/var/run/repmgrd.pid
-REPMGRD_LOCK=/var/lock/subsys/${NAME}
-REPMGRD_LOG=/var/lib/pgsql/9.3/data/pg_log/repmgrd.log
-
-# Read configuration variable file if it is present
-[ -r /etc/sysconfig/$NAME ] && . /etc/sysconfig/$NAME
-
-# For SELinux we need to use 'runuser' not 'su'
-if [ -x /sbin/runuser ]
-then
-    SU=runuser
-else
-    SU=su
-fi
-
-test -x $REPMGRD_BIN || exit 0
-
-case "$REPMGRD_ENABLED" in
-    [Yy]*)
-	break
-	;;
-    *)
-	exit 0
-	;;
-esac
-
-
-if [ -z "${REPMGRD_OPTS}" ]
-then
-    echo "Not starting ${NAME}, REPMGRD_OPTS not set in /etc/sysconfig/${NAME}"
-    exit 0
-fi
-
-start()
-{
-    REPMGRD_START=$"Starting ${NAME} service: "
-
-    # Make sure startup-time log file is valid
-    if [ ! -e "${REPMGRD_LOG}" -a ! -h "${REPMGRD_LOG}" ]
-    then
-        touch "${REPMGRD_LOG}" || exit 1
-        chown ${REPMGRD_USER}:postgres "${REPMGRD_LOG}"
-        chmod go-rwx "${REPMGRD_LOG}"
-        [ -x /sbin/restorecon ] && /sbin/restorecon "${REPMGRD_LOG}"
-    fi
-
-    echo -n "${REPMGRD_START}"
-    $SU -l $REPMGRD_USER -c "${REPMGRD_BIN} ${REPMGRD_OPTS} -p ${REPMGRD_PIDFILE} &" >> "${REPMGRD_LOG}" 2>&1 < /dev/null
-    sleep 2
-    pid=`head -n 1 "${REPMGRD_PIDFILE}" 2>/dev/null`
-    if [ "x${pid}" != "x" ]
-    then
-        success "${REPMGRD_START}"
-        touch "${REPMGRD_LOCK}"
-        echo $pid > "${REPMGRD_PIDFILE}"
-        echo
-    else
-        failure "${REPMGRD_START}"
-        echo
-        script_result=1
-    fi
-}
-
-stop()
-{
-    echo -n $"Stopping ${NAME} service: "
-    if [ -e "${REPMGRD_LOCK}" ]
-    then
-        killproc ${NAME}
-        ret=$? 
-        if [ $ret -eq 0 ]
-        then
-            echo_success
-            rm -f "${REPMGRD_PIDFILE}"
-            rm -f "${REPMGRD_LOCK}"
-        else
-            echo_failure
-            script_result=1
-        fi
-    else
-        # not running; per LSB standards this is "ok"   
-        echo_success
-    fi
-    echo
-}
-
-
-# See how we were called.
-case "$1" in
-  start)
-        start
-        ;;
-  stop)
-        stop
-        ;;
-  status)
-        status -p $REPMGRD_PIDFILE $NAME
-        script_result=$?
-        ;;
-  restart)
-        stop
-	start
-        ;;
-  *)
-        echo $"Usage: $0 {start|stop|status|restart}"
-        exit 2
-esac
-
-exit $script_result
--- a/RHEL/repmgrd.sysconfig
+++ b/RHEL/repmgrd.sysconfig
@@ -1,21 +0,0 @@
-# default settings for repmgrd. This file is source by /bin/sh from
-# /etc/init.d/repmgrd
-
-# disable repmgrd by default so it won't get started upon installation
-# valid values: yes/no
-REPMGRD_ENABLED=no
-
-# Options for repmgrd (required)
-#REPMGRD_OPTS="--verbose -d -f /var/lib/pgsql/repmgr/repmgr.conf"
-
-# User to run repmgrd as
-#REPMGRD_USER=postgres
-
-# repmgrd binary
-#REPMGRD_BIN=/usr/bin/repmgrd
-
-# pid file
-#REPMGRD_PIDFILE=/var/lib/pgsql/repmgr/repmgrd.pid
-
-# log file
-#REPMGRD_LOG=/var/lib/pgsql/repmgr/repmgrd.log
--- a/SSH-RSYNC.md
+++ b/SSH-RSYNC.md
@@ -1,36 +0,0 @@
-Set up trusted copy between postgres accounts
---------------------------------------------
-
-If you need to use `rsync` to clone standby servers, the `postgres` account
-on your primary and standby servers must be each able to access the other
-using SSH without a password.
-
-First generate an ssh key, using an empty passphrase, and copy the resulting
-keys and a matching authorization file to a privileged user account on the other
-system:
-
-    [postgres@node1]$ ssh-keygen -t rsa
-    Generating public/private rsa key pair.
-    Enter file in which to save the key (/var/lib/pgsql/.ssh/id_rsa):
-    Enter passphrase (empty for no passphrase):
-    Enter same passphrase again:
-    Your identification has been saved in /var/lib/pgsql/.ssh/id_rsa.
-    Your public key has been saved in /var/lib/pgsql/.ssh/id_rsa.pub.
-    The key fingerprint is:
-    aa:bb:cc:dd:ee:ff:aa:11:22:33:44:55:66:77:88:99 postgres@db1.domain.com
-    [postgres@node1]$ cat ~/.ssh/id_rsa.pub >> ~/.ssh/authorized_keys
-    [postgres@node1]$ chmod go-rwx ~/.ssh/*
-    [postgres@node1]$ cd ~/.ssh
-    [postgres@node1]$ scp id_rsa.pub id_rsa authorized_keys user@node2:
-
-Login as a user on the other system, and install the files into the `postgres`
-user's account:
-
-    [user@node2 ~]$ sudo chown postgres.postgres authorized_keys id_rsa.pub id_rsa
-    [user@node2 ~]$ sudo mkdir -p ~postgres/.ssh
-    [user@node2 ~]$ sudo chown postgres.postgres ~postgres/.ssh
-    [user@node2 ~]$ sudo mv authorized_keys id_rsa.pub id_rsa ~postgres/.ssh
-    [user@node2 ~]$ sudo chmod -R go-rwx ~postgres/.ssh
-
-Now test that ssh in both directions works.  You may have to accept some new
-known hosts in the process.
--- a/73
+++ b/73
@@ -1,73 +1,14 @@
 Known issues in repmgr
 ======================

+* The check for whether ``wal_keep_segments`` is considered large enough
+  does a string comparison rather than an integer one.  It can give both
+  false positive (setting is large enough but flagged as too small) and
+  false negative (setting is too small but not noted as such) errors.
+
 * When running repmgr against a remote machine, operations that start
  the database server using the ``pg_ctl`` command may accidentally
  terminate after their associated ssh session ends.

-* PGPASSFILE may not be passed to pg_basebackup
-
-
-Planned feature improvements
-============================
-
-* Use 'primary' instead of 'master' in documentation and log output
-  for consistency with PostgreSQL documentation. See also commit
-  870b0a53b627eeb9aca1fc14cbafe25b5beafe12.
-
-* A better check which standby did receive most of the data
-
-* Make the fact that a standby may be delayed a factor in the voting
-  algorithm
-
-* include support for delayed standbys
-
-* Create the repmgr user/database on "master register".
-
-* Use pg_basebackup for the data directory, and ALSO rsync for the
-  configuration files.
-
-* If no configuration file supplied, search in sensible default locations
-  (currently: current directory and `pg_config --sysconfdir`); if
-  possible this should include the location provided by the package,
-  if installed.
-
-* repmgrd: if connection to the upstream node fails on startup, optionally
-  retry for a certain period before giving up; this will cover cases when
-  e.g. primary and standby are both starting up, and the standby comes up
-  before the primary. See github issue #80.
-
-* make old master node ID available for event notification commands
-  (See github issue #80).
-
-* repmgr standby clone: possibility to use barman instead of performing a new base backup
-
-* possibility to transform a failed master into a new standby with pg_rewind
-
-* "repmgr standby switchover" to promote a standby in a controlled manner
-   and convert the existing primary into a standby
-
-* make repmgrd more robust
-
-* repmgr: when cloning a standby using pg_basebackup and replication slots are
-  requested, activate the replication slot using pg_receivexlog to negate the
-  need to set `wal_keep_segments` just for the initial clone (9.4 and 9.5).
-
-* Take into account the fact that a standby can obtain WAL from an archive,
-  so even if direct streaming replication is interrupted, it may be up-to-date
-
-Usability improvements
-======================
-
-* repmgr: add interrupt handler, so that if the program is interrupted
-  while running a backup, an attempt can be made to execute pg_stop_backup()
-  on the primary, to prevent an orphaned backup state existing.
-
-* repmgr: when unregistering a node, delete any entries in the repl_monitoring
-  table.
-
-* repmgr: for "standby unregister", accept connection parameters for the
-  primary and perform metadata updates (and slot removal) directly on
-  the primary, to allow a shutdown standby to be unregistered
-  (currently the standby must still be running, which means the replication
-  slot can't be dropped).
+* After running repmgrd as a regular foreground application, hitting
+  control-C causes the program to crash.
--- a/check_dir.c
+++ b/check_dir.c
@@ -1,6 +1,6 @@
 /*
 * check_dir.c - Directories management functions
- * Copyright (C) 2ndQuadrant, 2010-2016
+ * Copyright (C) 2ndQuadrant, 2010-2011
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -23,18 +23,15 @@
 #include <errno.h>
 #include <stdio.h>
 #include <string.h>
-#include <ftw.h>

 /* NB: postgres_fe must be included BEFORE check_dir */
-#include <libpq-fe.h>
-#include <postgres_fe.h>
-
+#include "postgres_fe.h"
 #include "check_dir.h"
+
 #include "strutil.h"
 #include "log.h"

-static bool _create_pg_dir(char *dir, bool force, bool for_witness);
-static int unlink_dir_callback(const char *fpath, const struct stat *sb, int typeflag, struct FTW *ftwbuf);
+static int mkdir_p(char *path, mode_t omode);

 /*
 * make sure the directory either doesn't exist or is empty
@@ -49,9 +46,9 @@ static int unlink_dir_callback(const char *fpath, const struct stat *sb, int typ
 int
 check_dir(char *dir)
 {
-	DIR		   *chkdir;
-	struct dirent *file;
-	int			result = 1;
+	DIR        *chkdir;
+	struct 		dirent *file;
+	int         result = 1;

 	errno = 0;

@@ -63,7 +60,7 @@ check_dir(char *dir)
 	while ((file = readdir(chkdir)) != NULL)
 	{
 		if (strcmp(".", file->d_name) == 0 ||
-			strcmp("..", file->d_name) == 0)
+		        strcmp("..", file->d_name) == 0)
 		{
 			/* skip this and parent directory */
 			continue;
@@ -76,7 +73,6 @@ check_dir(char *dir)
 	}

 #ifdef WIN32
-
 	/*
 	 * This fix is in mingw cvs (runtime/mingwex/dirent.c rev 1.4), but not in
 	 * released version
@@ -88,29 +84,29 @@ check_dir(char *dir)
 	closedir(chkdir);

 	if (errno != 0)
-		return -1;				/* some kind of I/O error? */
+		return -1;          /* some kind of I/O error? */

 	return result;
 }


 /*
- * Create directory with error log message when failing
+ * Create directory
 */
 bool
-create_dir(char *dir)
+create_directory(char *dir)
 {
 	if (mkdir_p(dir, 0700) == 0)
 		return true;

-	log_err(_("unable to create directory \"%s\": %s\n"),
-			dir, strerror(errno));
+	log_err(_("Could not create directory \"%s\": %s\n"),
+	        dir, strerror(errno));

 	return false;
 }

 bool
-set_dir_permissions(char *dir)
+set_directory_permissions(char *dir)
 {
 	return (chmod(dir, 0700) != 0) ? false : true;
 }
@@ -128,15 +124,15 @@ set_dir_permissions(char *dir)
 * note that on failure, the path arg has been modified to show the particular
 * directory level we had problems with.
 */
-int
+static int
 mkdir_p(char *path, mode_t omode)
 {
 	struct stat sb;
 	mode_t		numask,
-				oumask;
+	            oumask;
 	int			first,
-				last,
-				retval;
+	            last,
+	            retval;
 	char	   *p;

 	p = path;
@@ -155,8 +151,8 @@ mkdir_p(char *path, mode_t omode)
 				return 1;
 		}
 		else if (p[1] == ':' &&
-				 ((p[0] >= 'a' && p[0] <= 'z') ||
-				  (p[0] >= 'A' && p[0] <= 'Z')))
+		         ((p[0] >= 'a' && p[0] <= 'z') ||
+		          (p[0] >= 'A' && p[0] <= 'Z')))
 		{
 			/* local drive */
 			p += 2;
@@ -227,123 +223,10 @@ bool
 is_pg_dir(char *dir)
 {
 	const size_t buf_sz = 8192;
-	char		path[buf_sz];
-	struct stat sb;
-	int			r;
+	char		 path[buf_sz];
+	struct stat	 sb;

-	/* test pgdata */
 	xsnprintf(path, buf_sz, "%s/PG_VERSION", dir);
-	if (stat(path, &sb) == 0)
-		return true;

-	/* test tablespace dir */
-	sprintf(path, "ls %s/PG_*/ -I*", dir);
-	r = system(path);
-	if (r == 0)
-		return true;
-
-	return false;
-}
-
-
-bool
-create_pg_dir(char *dir, bool force)
-{
-	return _create_pg_dir(dir, force, false);
-}
-
-bool
-create_witness_pg_dir(char *dir, bool force)
-{
-	return _create_pg_dir(dir, force, true);
-}
-
-
-static bool
-_create_pg_dir(char *dir, bool force, bool for_witness)
-{
-	bool		pg_dir = false;
-
-	/* Check this directory could be used as a PGDATA dir */
-	switch (check_dir(dir))
-	{
-		case 0:
-			/* dir not there, must create it */
-			log_info(_("creating directory \"%s\"...\n"), dir);
-
-			if (!create_dir(dir))
-			{
-				log_err(_("unable to create directory \"%s\"...\n"),
-						dir);
-				return false;
-			}
-			break;
-		case 1:
-			/* Present but empty, fix permissions and use it */
-			log_info(_("checking and correcting permissions on existing directory %s ...\n"),
-					 dir);
-
-			if (!set_dir_permissions(dir))
-			{
-				log_err(_("unable to change permissions of directory \"%s\": %s\n"),
-						dir, strerror(errno));
-				return false;
-			}
-			break;
-		case 2:
-			/* Present and not empty */
-			log_warning(_("directory \"%s\" exists but is not empty\n"),
-						dir);
-
-			pg_dir = is_pg_dir(dir);
-
-
-			if (pg_dir && force)
-			{
-
-				/*
-				 * The witness server does not store any data other than a copy of the
-				 * repmgr metadata, so in --force mode we can simply overwrite the
-				 * directory.
-				 *
-				 * For non-witness servers, we'll leave the data in place, both to reduce
-				 * the risk of unintentional data loss and to make it possible for the
-				 * data directory to be brought up-to-date with rsync.
-				 */
-				if (for_witness)
-				{
-					log_notice(_("deleting existing data directory \"%s\"\n"), dir);
-					nftw(dir, unlink_dir_callback, 64, FTW_DEPTH | FTW_PHYS);
-				}
-				/* Let it continue */
-				break;
-			}
-			else if (pg_dir && !force)
-			{
-				log_hint(_("This looks like a PostgreSQL directory.\n"
-							"If you are sure you want to clone here, "
-							"please check there is no PostgreSQL server "
-							"running and use the -F/--force option\n"));
-				return false;
-			}
-
-			return false;
-		default:
-			/* Trouble accessing directory */
-			log_err(_("could not access directory \"%s\": %s\n"),
-					dir, strerror(errno));
-			return false;
-	}
-	return true;
-}
-
-static int
-unlink_dir_callback(const char *fpath, const struct stat *sb, int typeflag, struct FTW *ftwbuf)
-{
-    int rv = remove(fpath);
-
-    if (rv)
-        perror(fpath);
-
-    return rv;
+	return (stat(path, &sb) == 0) ? true : false;
 }
--- a/check_dir.h
+++ b/check_dir.h
@@ -1,6 +1,6 @@
 /*
 * check_dir.h
- * Copyright (c) 2ndQuadrant, 2010-2016
+ * Copyright (c) 2ndQuadrant, 2010-2011
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -20,12 +20,9 @@
 #ifndef _REPMGR_CHECK_DIR_H_
 #define _REPMGR_CHECK_DIR_H_

-int			mkdir_p(char *path, mode_t omode);
-int			check_dir(char *dir);
-bool		create_dir(char *dir);
-bool		set_dir_permissions(char *dir);
-bool		is_pg_dir(char *dir);
-bool		create_pg_dir(char *dir, bool force);
-bool		create_witness_pg_dir(char *dir, bool force);
+int  check_dir(char *dir);
+bool create_directory(char *dir);
+bool set_directory_permissions(char *dir);
+bool is_pg_dir(char *dir);

 #endif
--- a/config.c
+++ b/config.c
--- a/config.h
+++ b/config.h
@@ -1,6 +1,6 @@
 /*
 * config.h
- * Copyright (c) 2ndQuadrant, 2010-2016
+ * Copyright (c) 2ndQuadrant, 2010-2011
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -20,93 +20,21 @@
 #ifndef _REPMGR_CONFIG_H_
 #define _REPMGR_CONFIG_H_

-#include "postgres_fe.h"
-
+#include "repmgr.h"
 #include "strutil.h"

-#define CONFIG_FILE_NAME	"repmgr.conf"
-
-typedef struct EventNotificationListCell
-{
-	struct EventNotificationListCell *next;
-	char event_type[MAXLEN];
-} EventNotificationListCell;
-
-typedef struct EventNotificationList
-{
-	EventNotificationListCell *head;
-	EventNotificationListCell *tail;
-} EventNotificationList;
-
-typedef struct TablespaceListCell
-{
-	struct TablespaceListCell *next;
-	char		old_dir[MAXPGPATH];
-	char		new_dir[MAXPGPATH];
-} TablespaceListCell;
-
-typedef struct TablespaceList
-{
-	TablespaceListCell *head;
-	TablespaceListCell *tail;
-} TablespaceList;
-
 typedef struct
 {
-	char		cluster_name[MAXLEN];
-	int			node;
-	int         upstream_node;
-	char		conninfo[MAXLEN];
-	int			failover;
-	int			priority;
-	char		node_name[MAXLEN];
-	char		promote_command[MAXLEN];
-	char		follow_command[MAXLEN];
-	char		loglevel[MAXLEN];
-	char		logfacility[MAXLEN];
-	char		rsync_options[QUERY_STR_LEN];
-	char		ssh_options[QUERY_STR_LEN];
-	int			master_response_timeout;
-	int			reconnect_attempts;
-	int			reconnect_interval;
-	char		pg_bindir[MAXLEN];
-	char		pg_ctl_options[MAXLEN];
-	char		pg_basebackup_options[MAXLEN];
-	char		logfile[MAXLEN];
-	int			monitor_interval_secs;
-	int			retry_promote_interval_secs;
-	int			use_replication_slots;
-	char		event_notification_command[MAXLEN];
-	EventNotificationList event_notifications;
-	TablespaceList tablespace_mapping;
-}	t_configuration_options;
+	char cluster_name[MAXLEN];
+	int node;
+	char conninfo[MAXLEN];
+	char loglevel[MAXLEN];
+	char logfacility[MAXLEN];
+	char rsync_options[QUERY_STR_LEN];
+} t_configuration_options;

-#define T_CONFIGURATION_OPTIONS_INITIALIZER { "", -1, NO_UPSTREAM_NODE, "", MANUAL_FAILOVER, -1, "", "", "", "", "", "", "", -1, -1, -1, "", "", "", "", 0, 0, 0, "", { NULL, NULL }, {NULL, NULL} }
-
-typedef struct ErrorListCell
-{
-	struct ErrorListCell *next;
-	char			     *error_message;
-} ErrorListCell;
-
-typedef struct ErrorList
-{
-	ErrorListCell *head;
-	ErrorListCell *tail;
-} ErrorList;
-
-void set_progname(const char *argv0);
-const char * progname(void);
-
-bool		load_config(const char *config_file, bool verbose, t_configuration_options *options, char *argv0);
-bool		reload_config(t_configuration_options *orig_options);
-bool		parse_config(t_configuration_options *options);
-void		parse_line(char *buff, char *name, char *value);
-char	   *trim(char *s);
-void		error_list_append(ErrorList *error_list, char *error_message);
-int			repmgr_atoi(const char *s,
-						const char *config_item,
-						ErrorList *error_list,
-						bool allow_negative);
+void parse_config(const char* config_file, t_configuration_options* options);
+void parse_line(char *buff, char *name, char *value);
+char *trim(char *s);

 #endif
--- a/dbutils.c
+++ b/dbutils.c
--- a/dbutils.h
+++ b/dbutils.h
@@ -1,6 +1,6 @@
 /*
 * dbutils.h
- * Copyright (c) 2ndQuadrant, 2010-2016
+ * Copyright (c) 2ndQuadrant, 2010-2011
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -20,116 +20,18 @@
 #ifndef _REPMGR_DBUTILS_H_
 #define _REPMGR_DBUTILS_H_

-#include "access/xlogdefs.h"
-
-#include "config.h"
 #include "strutil.h"

+PGconn *establishDBConnection(const char *conninfo, const bool exit_on_error);
+PGconn *establishDBConnectionByParams(const char *keywords[],
+                                      const char *values[],
+                                      const bool exit_on_error);
+bool	is_standby(PGconn *conn);
+char   *pg_version(PGconn *conn, char* major_version);
+bool	guc_setted(PGconn *conn, const char *parameter, const char *op,
+                   const char *value);
+const char	 *get_cluster_size(PGconn *conn);
+PGconn *getMasterConnection(PGconn *standby_conn, char *cluster,
+                            int *master_id, char *master_conninfo_out);

-typedef enum {
-	UNKNOWN = 0,
-	MASTER,
-	STANDBY,
-	WITNESS
-} t_server_type;
-
-/*
- * Struct to store node information
- */
-typedef struct s_node_info
-{
-	int			  node_id;
-	int			  upstream_node_id;
-	t_server_type type;
-	char		  name[MAXLEN];
-	char		  conninfo_str[MAXLEN];
-	char		  slot_name[MAXLEN];
-	int			  priority;
-	bool		  active;
-	bool		  is_ready;
-	bool		  is_visible;
-	XLogRecPtr	  xlog_location;
-}	t_node_info;
-
-
-/*
- * Struct to store replication slot information
- */
-
-typedef struct s_replication_slot
-{
-	char slot_name[MAXLEN];
-    char slot_type[MAXLEN];
-	bool active;
-}   t_replication_slot;
-
-
-#define T_NODE_INFO_INITIALIZER { \
-  NODE_NOT_FOUND, \
-  NO_UPSTREAM_NODE, \
-  UNKNOWN, \
-  "", \
-  "", \
-  "", \
-  DEFAULT_PRIORITY, \
-  true, \
-  false, \
-  false, \
-  InvalidXLogRecPtr \
-}
-
-PGconn *_establish_db_connection(const char *conninfo,
-								 const bool exit_on_error,
-								 const bool log_notice);
-PGconn *establish_db_connection(const char *conninfo,
-								const bool exit_on_error);
-PGconn *test_db_connection(const char *conninfo,
-						   const bool exit_on_error);
-PGconn *establish_db_connection_by_params(const char *keywords[],
-								  const char *values[],
-								  const bool exit_on_error);
-bool		begin_transaction(PGconn *conn);
-bool		commit_transaction(PGconn *conn);
-bool		rollback_transaction(PGconn *conn);
-bool		check_cluster_schema(PGconn *conn);
-int			is_standby(PGconn *conn);
-bool		is_pgup(PGconn *conn, int timeout);
-int			get_master_node_id(PGconn *conn, char *cluster);
-int			get_server_version(PGconn *conn, char *server_version);
-bool		get_cluster_size(PGconn *conn, char *size);
-bool		get_pg_setting(PGconn *conn, const char *setting, char *output);
-
-int			guc_set(PGconn *conn, const char *parameter, const char *op,
-			const char *value);
-int			guc_set_typed(PGconn *conn, const char *parameter, const char *op,
-			  const char *value, const char *datatype);
-bool		get_conninfo_value(const char *conninfo, const char *keyword, char *output);
-PGconn     *get_upstream_connection(PGconn *standby_conn, char *cluster,
-									int node_id,
-									int *upstream_node_id_ptr,
-									char *upstream_conninfo_out);
-PGconn	   *get_master_connection(PGconn *standby_conn, char *cluster,
-					  int *master_id, char *master_conninfo_out);
-
-int			wait_connection_availability(PGconn *conn, long long timeout);
-bool		cancel_query(PGconn *conn, int timeout);
-char       *get_repmgr_schema(void);
-char       *get_repmgr_schema_quoted(PGconn *conn);
-bool		create_replication_slot(PGconn *conn, char *slot_name);
-int			get_slot_record(PGconn *conn, char *slot_name, t_replication_slot *record);
-bool		drop_replication_slot(PGconn *conn, char *slot_name);
-bool		start_backup(PGconn *conn, char *first_wal_segment, bool fast_checkpoint);
-bool		stop_backup(PGconn *conn, char *last_wal_segment);
-bool		set_config_bool(PGconn *conn, const char *config_param, bool state);
-bool		copy_configuration(PGconn *masterconn, PGconn *witnessconn, char *cluster_name);
-bool		create_node_record(PGconn *conn, char *action, int node, char *type, int upstream_node, char *cluster_name, char *node_name, char *conninfo, int priority, char *slot_name);
-bool		delete_node_record(PGconn *conn, int node, char *action);
-int			get_node_record(PGconn *conn, char *cluster, int node_id, t_node_info *node_info);
-bool        update_node_record_status(PGconn *conn, char *cluster_name, int this_node_id, char *type, int upstream_node_id, bool active);
-bool        update_node_record_set_upstream(PGconn *conn, char *cluster_name, int this_node_id, int new_upstream_node_id);
-bool        create_event_record(PGconn *conn, t_configuration_options *options, int node_id, char *event, bool successful, char *details);
-
-int		    get_node_replication_state(PGconn *conn, char *node_name, char *output);
-t_server_type parse_node_type(const char *type);
-int			get_data_checksum_version(const char *data_directory);
 #endif
--- a/debian/DEBIAN/control
+++ b/debian/DEBIAN/control
@@ -1,9 +1,9 @@
-Package: repmgr-auto
-Version: 3.0.1
+Package: repmgr
+Version: 1.0-1
 Section: database
 Priority: optional
 Architecture: all
-Depends: rsync, postgresql-9.3 | postgresql-9.4
-Maintainer: Self built package <user@localhost>
+Depends: rsync, postgresql-9.0
+Maintainer: Greg Smith <greg@2ndQuadrant.com>
 Description: PostgreSQL replication setup, magament and monitoring
 has two main executables
--- a/debian/repmgr.repmgrd.default
+++ b/debian/repmgr.repmgrd.default
@@ -1,18 +0,0 @@
-# default settings for repmgrd. This file is source by /bin/sh from
-# /etc/init.d/repmgrd
-
-# disable repmgrd by default so it won't get started upon installation
-# valid values: yes/no
-REPMGRD_ENABLED=no
-
-# Options for repmgrd (required)
-#REPMGRD_OPTS="--config-file /path/to/repmgr.conf"
-
-# User to run repmgrd as
-#REPMGRD_USER=postgres
-
-# repmgrd binary
-#REPMGRD_BIN=/usr/bin/repmgrd
-
-# pid file
-#REPMGRD_PIDFILE=/var/run/repmgrd.pid
--- a/debian/repmgr.repmgrd.init
+++ b/debian/repmgr.repmgrd.init
@@ -1,101 +0,0 @@
-#!/bin/sh
-### BEGIN INIT INFO
-# Provides:	     repmgrd
-# Required-Start:    $local_fs $remote_fs $network $syslog postgresql
-# Required-Stop:     $local_fs $remote_fs $network $syslog postgresql
-# Should-Start:	     $syslog postgresql
-# Default-Start:     2 3 4 5
-# Default-Stop:	     0 1 6
-# Short-Description: Start/stop repmgrd
-# Description:       Enable repmgrd replication management and monitoring daemon for PostgreSQL
-### END INIT INFO
-
-set -e
-
-DESC="PostgreSQL replication management and monitoring daemon"
-NAME=repmgrd
-
-REPMGRD_ENABLED=no
-REPMGRD_OPTS=
-REPMGRD_USER=postgres
-REPMGRD_BIN=/usr/bin/repmgrd
-REPMGRD_PIDFILE=/var/run/repmgrd.pid
-
-# Read configuration variable file if it is present
-[ -r /etc/default/$NAME ] && . /etc/default/$NAME
-
-test -x $REPMGRD_BIN || exit 0
-
-case "$REPMGRD_ENABLED" in
-    [Yy]*)
-	break
-	;;
-    *)
-	exit 0
-	;;
-esac
-
-# Define LSB log_* functions.
-. /lib/lsb/init-functions
-
-if [ -z "$REPMGRD_OPTS" ]
-then
-    log_warning_msg "Not starting $NAME, REPMGRD_OPTS not set in /etc/default/$NAME"
-    exit 0
-fi
-
-do_start()
-{
-	# Return
-	#   0 if daemon has been started
-	#   1 if daemon was already running
-	#   other if daemon could not be started or a failure occured
-	start-stop-daemon --start --quiet --background --chuid $REPMGRD_USER --make-pidfile --pidfile $REPMGRD_PIDFILE --exec $REPMGRD_BIN -- $REPMGRD_OPTS
-}
-
-do_stop()
-{
-	# Return
-	#   0 if daemon has been stopped
-	#   1 if daemon was already stopped
-	#   other if daemon could not be stopped or a failure occurred
-	start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $REPMGRD_PIDFILE --name "$(basename $REPMGRD_BIN)"
-}
-
-case "$1" in
-  start)
-	log_daemon_msg "Starting $DESC" "$NAME"
-	do_start
-	case "$?" in
-		0) log_end_msg 0 ;;
-		1) log_progress_msg "already started"
-		   log_end_msg 0 ;;
-		*) log_end_msg 1 ;;
-	esac
-
-	;;
-  stop)
-	log_daemon_msg "Stopping $DESC" "$NAME"
-	do_stop
-	case "$?" in
-		0) log_end_msg 0 ;;
-		1) log_progress_msg "already stopped"
-		   log_end_msg 0 ;;
-		*) log_end_msg 1 ;;
-	esac
-
-	;;
-  restart|force-reload)
-	$0 stop
-	$0 start
-	;;
-  status)
-	status_of_proc -p $REPMGRD_PIDFILE $REPMGRD_BIN $NAME && exit 0 || exit $?
-	;;
-  *)
-	echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload|status}" >&2
-	exit 3
-	;;
-esac
-
-exit 0
--- a/errcode.h
+++ b/errcode.h
@@ -1,6 +1,6 @@
 /*
 * errcode.h
- * Copyright (C) 2ndQuadrant, 2010-2016
+ * Copyright (C) 2ndQuadrant, 2011
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -25,17 +25,13 @@
 #define SUCCESS 0
 #define ERR_BAD_CONFIG 1
 #define ERR_BAD_RSYNC 2
+#define ERR_STOP_BACKUP 3
 #define ERR_NO_RESTART 4
+#define ERR_NEEDS_XLOG 5
 #define ERR_DB_CON 6
 #define ERR_DB_QUERY 7
 #define ERR_PROMOTED 8
 #define ERR_BAD_PASSWORD 9
 #define ERR_STR_OVERFLOW 10
-#define ERR_FAILOVER_FAIL 11
-#define ERR_BAD_SSH 12
-#define ERR_SYS_FAILURE 13
-#define ERR_BAD_BASEBACKUP 14
-#define ERR_INTERNAL 15
-#define ERR_MONITORING_FAIL 16

-#endif   /* _ERRCODE_H_ */
+#endif	/* _ERRCODE_H_ */
--- a/log.c
+++ b/log.c
@@ -1,6 +1,6 @@
 /*
 * log.c - Logging methods
- * Copyright (C) 2ndQuadrant, 2010-2016
+ * Copyright (C) 2ndQuadrant, 2010-2011
 *
 * This module is a set of methods for logging (currently only syslog)
 *
@@ -25,10 +25,8 @@

 #ifdef HAVE_SYSLOG
 #include <syslog.h>
-#endif
-
 #include <stdarg.h>
-#include <time.h>
+#endif

 #include "log.h"

@@ -39,118 +37,20 @@

 /* #define REPMGR_DEBUG */

-static int	detect_log_facility(const char *facility);
-static void _stderr_log_with_level(const char *level_name, int level, const char *fmt, va_list ap);
+static int detect_log_level(const char* level);
+static int detect_log_facility(const char* facility);

-int			log_type = REPMGR_STDERR;
-int			log_level = LOG_NOTICE;
-int			last_log_level = LOG_NOTICE;
-int			verbose_logging = false;
-int			terse_logging = false;
+int log_type = REPMGR_STDERR;
+int log_level = LOG_NOTICE;

-void
-stderr_log_with_level(const char *level_name, int level, const char *fmt, ...)
+bool logger_init(const char* ident, const char* level, const char* facility)
 {
-	va_list		arglist;

-	va_start(arglist, fmt);
-	_stderr_log_with_level(level_name, level, fmt, arglist);
-	va_end(arglist);
-}
-
-static void
-_stderr_log_with_level(const char *level_name, int level, const char *fmt, va_list ap)
-{
-	time_t		t;
-	struct tm  *tm;
-	char		buff[100];
-
-	/*
-	 * Store the requested level so that if there's a subsequent
-	 * log_hint(), we can suppress that if appropriate.
-	 */
-	last_log_level = level;
-
-	if (log_level >= level)
-	{
-		time(&t);
-		tm = localtime(&t);
-		strftime(buff, 100, "[%Y-%m-%d %H:%M:%S]", tm);
-		fprintf(stderr, "%s [%s] ", buff, level_name);
-
-		vfprintf(stderr, fmt, ap);
-
-		fflush(stderr);
-	}
-}
-
-void
-log_hint(const char *fmt, ...)
-{
-	va_list		ap;
-
-	if (terse_logging == false)
-	{
-		va_start(ap, fmt);
-		_stderr_log_with_level("HINT", last_log_level, fmt, ap);
-		va_end(ap);
-	}
-}
-
-
-void
-log_verbose(int level, const char *fmt, ...)
-{
-	va_list		ap;
-
-	va_start(ap, fmt);
-
-	if (verbose_logging == true)
-	{
-		switch(level)
-		{
-			case LOG_EMERG:
-				_stderr_log_with_level("EMERG", level, fmt, ap);
-				break;
-			case LOG_ALERT:
-				_stderr_log_with_level("ALERT", level, fmt, ap);
-				break;
-			case LOG_CRIT:
-				_stderr_log_with_level("CRIT", level, fmt, ap);
-				break;
-			case LOG_ERR:
-				_stderr_log_with_level("ERR", level, fmt, ap);
-				break;
-			case LOG_WARNING:
-				_stderr_log_with_level("WARNING", level, fmt, ap);
-				break;
-			case LOG_NOTICE:
-				_stderr_log_with_level("NOTICE", level, fmt, ap);
-				break;
-			case LOG_INFO:
-				_stderr_log_with_level("INFO", level, fmt, ap);
-				break;
-			case LOG_DEBUG:
-				_stderr_log_with_level("DEBUG", level, fmt, ap);
-				break;
-		}
-	}
-
-	va_end(ap);
-}
-
-
-bool
-logger_init(t_configuration_options * opts, const char *ident)
-{
-	char	   *level = opts->loglevel;
-	char	   *facility = opts->logfacility;
-
-	int			l;
-	int			f;
+	int l;
+	int f;

 #ifdef HAVE_SYSLOG
-	int			syslog_facility = DEFAULT_SYSLOG_FACILITY;
+	int syslog_facility = DEFAULT_SYSLOG_FACILITY;
 #endif

 #ifdef REPMGR_DEBUG
@@ -169,10 +69,10 @@ logger_init(t_configuration_options * opts, const char *ident)
 		printf("Assigned level for logger: %d\n", l);
 #endif

-		if (l >= 0)
+		if (l > 0)
 			log_level = l;
 		else
-			stderr_log_warning(_("Invalid log level \"%s\" (available values: DEBUG, INFO, NOTICE, WARNING, ERR, ALERT, CRIT or EMERG)\n"), level);
+			stderr_log_warning(_("Cannot detect log level %s (use any of DEBUG, INFO, NOTICE, WARNING, ERR, ALERT, CRIT or EMERG)\n"), level);
 	}

 	if (facility && *facility)
@@ -207,53 +107,21 @@ logger_init(t_configuration_options * opts, const char *ident)

 	if (log_type == REPMGR_SYSLOG)
 	{
-		setlogmask(LOG_UPTO(log_level));
-		openlog(ident, LOG_CONS | LOG_PID | LOG_NDELAY, syslog_facility);
+		setlogmask (LOG_UPTO (log_level));
+		openlog (ident, LOG_CONS | LOG_PID | LOG_NDELAY, syslog_facility);

 		stderr_log_notice(_("Setup syslog (level: %s, facility: %s)\n"), level, facility);
 	}
+
 #endif

-	if (*opts->logfile)
-	{
-		FILE	   *fd;
-
-		/* Check if we can write to the specified file before redirecting
-		 * stderr - if freopen() fails, stderr output will vanish into
-		 * the ether and the user won't know what's going on.
-		 */
-
-		fd = fopen(opts->logfile, "a");
-		if (fd == NULL)
-		{
-			stderr_log_err(_("Unable to open specified logfile '%s' for writing: %s\n"), opts->logfile, strerror(errno));
-			stderr_log_err(_("Terminating\n"));
-			exit(ERR_BAD_CONFIG);
-		}
-		fclose(fd);
-
-		stderr_log_notice(_("Redirecting logging output to '%s'\n"), opts->logfile);
-		fd = freopen(opts->logfile, "a", stderr);
-
-		/* It's possible freopen() may still fail due to e.g. a race condition;
-		   as it's not feasible to restore stderr after a failed freopen(),
-		   we'll write to stdout as a last resort.
-		 */
-		if (fd == NULL)
-		{
-			printf(_("Unable to open specified logfile %s for writing: %s\n"), opts->logfile, strerror(errno));
-			printf(_("Terminating\n"));
-			exit(ERR_BAD_CONFIG);
-		}
-	}
-
 	return true;
+
 }

-
-bool
-logger_shutdown(void)
+bool logger_shutdown(void)
 {
+
 #ifdef HAVE_SYSLOG
 	if (log_type == REPMGR_SYSLOG)
 		closelog();
@@ -263,34 +131,17 @@ logger_shutdown(void)
 }

 /*
- * Indicate whether extra-verbose logging is required. This will
- * generate a lot of output, particularly debug logging, and should
- * not be permanently enabled in production.
- *
- * NOTE: in previous repmgr versions, this option forced the log
- * level to INFO.
+ * Set a minimum logging level.  Intended for command line verbosity
+ * options, which might increase requested logging over what's specified
+ * in the regular configuration file.
 */
-void
-logger_set_verbose(void)
+void logger_min_verbose(int minimum)
 {
-	verbose_logging = true;
+	if (log_level < minimum)
+		log_level = minimum;
 }

-
-/*
- * Indicate whether some non-critical log messages can be omitted.
- * Currently this includes warnings about irrelevant command line
- * options and hints.
- */
-
-void logger_set_terse(void)
-{
-	terse_logging = true;
-}
-
-
-int
-detect_log_level(const char *level)
+int detect_log_level(const char* level)
 {
 	if (!strcmp(level, "DEBUG"))
 		return LOG_DEBUG;
@@ -309,44 +160,43 @@ detect_log_level(const char *level)
 	if (!strcmp(level, "EMERG"))
 		return LOG_EMERG;

-	return -1;
+	return 0;
 }

-static int
-detect_log_facility(const char *facility)
+int detect_log_facility(const char* facility)
 {
-	int			local = 0;
-
+	int local = 0;
 	if (!strncmp(facility, "LOCAL", 5) && strlen(facility) == 6)
 	{
-		local = atoi(&facility[5]);
+
+		local = atoi (&facility[5]);

 		switch (local)
 		{
-			case 0:
-				return LOG_LOCAL0;
-				break;
-			case 1:
-				return LOG_LOCAL1;
-				break;
-			case 2:
-				return LOG_LOCAL2;
-				break;
-			case 3:
-				return LOG_LOCAL3;
-				break;
-			case 4:
-				return LOG_LOCAL4;
-				break;
-			case 5:
-				return LOG_LOCAL5;
-				break;
-			case 6:
-				return LOG_LOCAL6;
-				break;
-			case 7:
-				return LOG_LOCAL7;
-				break;
+		case 0:
+			return LOG_LOCAL0;
+			break;
+		case 1:
+			return LOG_LOCAL1;
+			break;
+		case 2:
+			return LOG_LOCAL2;
+			break;
+		case 3:
+			return LOG_LOCAL3;
+			break;
+		case 4:
+			return LOG_LOCAL4;
+			break;
+		case 5:
+			return LOG_LOCAL5;
+			break;
+		case 6:
+			return LOG_LOCAL6;
+			break;
+		case 7:
+			return LOG_LOCAL7;
+			break;
 		}

 	}
--- a/log.h
+++ b/log.h
@@ -1,6 +1,6 @@
 /*
 * log.h
- * Copyright (c) 2ndQuadrant, 2010-2016
+ * Copyright (c) 2ndQuadrant, 2010-2011
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -25,19 +25,15 @@
 #define REPMGR_SYSLOG 1
 #define REPMGR_STDERR 2

-void
-stderr_log_with_level(const char *level_name, int level, const char *fmt,...)
-__attribute__((format(PG_PRINTF_ATTRIBUTE, 3, 4)));
-
 /* Standard error logging */
-#define stderr_log_debug(...) stderr_log_with_level("DEBUG", LOG_DEBUG, __VA_ARGS__)
-#define stderr_log_info(...)  stderr_log_with_level("INFO", LOG_INFO, __VA_ARGS__)
-#define stderr_log_notice(...) stderr_log_with_level("NOTICE", LOG_NOTICE, __VA_ARGS__)
-#define stderr_log_warning(...) stderr_log_with_level("WARNING", LOG_WARNING, __VA_ARGS__)
-#define stderr_log_err(...) stderr_log_with_level("ERROR", LOG_ERR, __VA_ARGS__)
-#define stderr_log_crit(...) stderr_log_with_level("CRITICAL", LOG_CRIT, __VA_ARGS__)
-#define stderr_log_alert(...) stderr_log_with_level("ALERT", LOG_ALERT, __VA_ARGS__)
-#define stderr_log_emerg(...) stderr_log_with_level("EMERGENCY", LOG_EMERG, __VA_ARGS__)
+#define stderr_log_debug(...) if (log_level >= LOG_DEBUG) fprintf(stderr, __VA_ARGS__)
+#define stderr_log_info(...) if (log_level >= LOG_INFO) fprintf(stderr, __VA_ARGS__)
+#define stderr_log_notice(...) if (log_level >= LOG_NOTICE) fprintf(stderr, __VA_ARGS__)
+#define stderr_log_warning(...) if (log_level >= LOG_WARNING) fprintf(stderr, __VA_ARGS__)
+#define stderr_log_err(...) if (log_level >= LOG_ERR) fprintf(stderr, __VA_ARGS__)
+#define stderr_log_crit(...) if (log_level >= LOG_CRIT) fprintf(stderr, __VA_ARGS__)
+#define stderr_log_alert(...) if (log_level >= LOG_ALERT) fprintf(stderr, __VA_ARGS__)
+#define stderr_log_emerg(...) if (log_level >= LOG_EMERG) fprintf(stderr, __VA_ARGS__)

 #ifdef HAVE_SYSLOG

@@ -90,16 +86,17 @@ __attribute__((format(PG_PRINTF_ATTRIBUTE, 3, 4)));
 		if (log_type == REPMGR_SYSLOG) syslog(LOG_ALERT, __VA_ARGS__); \
 		else stderr_log_alert(__VA_ARGS__); \
 	}
+
 #else

-#define LOG_EMERG	0			/* system is unusable */
-#define LOG_ALERT	1			/* action must be taken immediately */
-#define LOG_CRIT	2			/* critical conditions */
-#define LOG_ERR		3			/* error conditions */
-#define LOG_WARNING 4			/* warning conditions */
-#define LOG_NOTICE	5			/* normal but significant condition */
-#define LOG_INFO	6			/* informational */
-#define LOG_DEBUG	7			/* debug-level messages */
+#define	LOG_EMERG	0	/* system is unusable */
+#define	LOG_ALERT	1	/* action must be taken immediately */
+#define	LOG_CRIT	2	/* critical conditions */
+#define	LOG_ERR		3	/* error conditions */
+#define	LOG_WARNING	4	/* warning conditions */
+#define	LOG_NOTICE	5	/* normal but significant condition */
+#define	LOG_INFO	6	/* informational */
+#define	LOG_DEBUG	7	/* debug-level messages */

 #define log_debug(...) stderr_log_debug(__VA_ARGS__)
 #define log_info(...) stderr_log_info(__VA_ARGS__)
@@ -109,24 +106,16 @@ __attribute__((format(PG_PRINTF_ATTRIBUTE, 3, 4)));
 #define log_crit(...) stderr_log_crit(__VA_ARGS__)
 #define log_alert(...) stderr_log_alert(__VA_ARGS__)
 #define log_emerg(...) stderr_log_emerg(__VA_ARGS__)
+
 #endif


-int			detect_log_level(const char *level);
-
 /* Logger initialisation and shutdown */
+bool logger_shutdown(void);
+bool logger_init(const char* ident, const char* level, const char* facility);
+void logger_min_verbose(int minimum);

-bool		logger_init(t_configuration_options * opts, const char *ident);
-
-bool		logger_shutdown(void);
-
-void		logger_set_verbose(void);
-void		logger_set_terse(void);
-
-void		log_hint(const char *fmt, ...);
-void		log_verbose(int level, const char *fmt, ...);
-
-extern int	log_type;
-extern int	log_level;
+extern int log_type;
+extern int log_level;

 #endif
--- a/repmgr.c
+++ b/repmgr.c
--- a/repmgr.conf
+++ b/repmgr.conf
@@ -0,0 +1,21 @@
+###################################################
+# Replication Manager configuration file
+###################################################
+
+# Cluster name
+cluster=test
+
+# Node ID
+node=2
+
+# Connection information
+conninfo='host=192.168.204.104'
+rsync_options=--archive --checksum --compress --progress --rsh=ssh
+
+# Log level: possible values are DEBUG, INFO, NOTICE, WARNING, ERR, ALERT, CRIT or EMERG
+# Default: NOTICE
+loglevel=NOTICE
+
+# Logging facility: possible values are STDERR or - for Syslog integration - one of LOCAL0, LOCAL1, ..., LOCAL7, USER
+# Default: STDERR
+logfacility=STDERR
--- a/repmgr.conf.sample
+++ b/repmgr.conf.sample
@@ -1,148 +0,0 @@
-###################################################
-# Replication Manager sample configuration file
-###################################################
-
-# Some configuration items will be set with a default value; this
-# is noted for each item. Where no default value is shown, the
-# parameter will be treated as empty or false.
-
-# Required configuration items
-# ============================
-#
-# repmgr and repmgrd require these items to be configured:
-
-# Cluster name - this will be used by repmgr to generate its internal
-# schema (pattern: "repmgr_{cluster}"); while this name will be quoted
-# to preserve case, we recommend using lower case and avoiding whitespace
-# to facilitate easier querying of the repmgr views and tables.
-cluster=example_cluster
-
-# Node ID and name
-# (Note: we recommend to avoid naming nodes after their initial
-#  replication funcion, as this will cause confusion when e.g.
-#  "standby2" is promoted to primary)
-node=2           # a unique integer
-node_name=node2  # an arbitrary (but unique) string; we recommend using
-                 # the server's hostname or another identifier unambiguously
-                 # associated with the server to avoid confusion
-
-# Database connection information as a conninfo string
-# This must be accessible to all servers in the cluster; for details see:
-#   http://www.postgresql.org/docs/current/static/libpq-connect.html#LIBPQ-CONNSTRING
-conninfo='host=192.168.204.104 dbname=repmgr_db user=repmgr_usr'
-
-# Optional configuration items
-# ============================
-
-# Replication settings
-# ---------------------
-
-# when using cascading replication and a standby is to be connected to an
-# upstream standby, specify that node's ID with 'upstream_node'. The node
-# must exist before the new standby can be registered. If a standby is
-# to connect directly to a primary node, this parameter is not required.
-upstream_node=1
-
-# use physical replication slots - PostgreSQL 9.4 and later only
-# (default: 0)
-use_replication_slots=0
-
-# NOTE: 'max_replication_slots' should be configured for at least the
-# number of standbys which will connect to the primary.
-
-# Logging and monitoring settings
-# -------------------------------
-
-# Log level: possible values are DEBUG, INFO, NOTICE, WARNING, ERR, ALERT, CRIT or EMERG
-# (default: NOTICE)
-loglevel=NOTICE
-
-# Logging facility: possible values are STDERR or - for Syslog integration - one of LOCAL0, LOCAL1, ..., LOCAL7, USER
-# (default: STDERR)
-logfacility=STDERR
-
-# stderr can be redirected to an arbitrary file:
-#
-logfile='/var/log/repmgr/repmgr.log'
-
-# event notifications can be passed to an arbitrary external program
-# together with the following parameters:
-#
-#   %n - node ID
-#   %e - event type
-#   %s - success (1 or 0)
-#   %t - timestamp
-#   %d - details
-#
-# the values provided for "%t" and "%d" will probably contain spaces,
-# so should be quoted in the provided command configuration, e.g.:
-#
-event_notification_command='/path/to/some/script %n %e %s "%t" "%d"'
-
-# By default, all notifications will be passed; the notification types
-# can be filtered to explicitly named ones:
-#
-event_notifications=master_register,standby_register,witness_create
-
-
-# Environment/command settings
-# ----------------------------
-
-# path to PostgreSQL binary directory (location of pg_ctl, pg_basebackup etc.)
-# (if not provided, defaults to system $PATH)
-pg_bindir=/usr/bin/
-
-# external command options
-
-rsync_options=--archive --checksum --compress --progress --rsh="ssh -o \"StrictHostKeyChecking no\""
-ssh_options=-o "StrictHostKeyChecking no"
-
-# external command arguments. Values shown are examples.
-
-pg_ctl_options='-s'
-pg_basebackup_options='--xlog-method=s'
-
-
-# Standby clone settings
-# ----------------------
-#
-# These settings apply when cloning a standby (`repmgr standby clone`).
-
-# Tablespaces can be remapped from one file system location to another:
-#
-# tablespace_mapping=/path/to/original/tablespace=/path/to/new/tablespace
-
-
-# Failover settings (repmgrd)
-# ---------------------------
-#
-# These settings are only applied when repmgrd is running. Values shown
-# are defaults.
-
-# Number of seconds to wait for a response from the primary server before
-# deciding it has failed.
-
-master_response_timeout=60
-
-# Number of attempts at what interval (in seconds) to try and
-# connect to  a server to establish its status (e.g. master
-# during failover)
-reconnect_attempts=6
-reconnect_interval=10
-
-# Autofailover options
-failover=manual     # one of 'automatic', 'manual'
-                    # (default: manual)
-priority=100        # a value of zero or less prevents the node being promoted to primary
-                    # (default: 100)
-promote_command='repmgr standby promote -f /path/to/repmgr.conf'
-follow_command='repmgr standby follow -f /path/to/repmgr.conf -W'
-
-# monitoring interval in seconds; default is 2
-monitor_interval_secs=2
-
-# change wait time for primary; before we bail out and exit when the primary
-# disappears, we wait 'reconnect_attempts' * 'retry_promote_interval_secs'
-# seconds; by default this would be half an hour, as 'retry_promote_interval_secs'
-# default value is 300)
-retry_promote_interval_secs=300
--- a/repmgr.h
+++ b/repmgr.h
@@ -1,6 +1,6 @@
 /*
 * repmgr.h
- * Copyright (c) 2ndQuadrant, 2010-2016
+ * Copyright (c) 2ndQuadrant, 2010-2011
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -20,85 +20,47 @@
 #ifndef _REPMGR_H_
 #define _REPMGR_H_

-#include <libpq-fe.h>
-#include <postgres_fe.h>
-#include <getopt_long.h>
+#include "postgres_fe.h"
+#include "getopt_long.h"
+#include "libpq-fe.h"

 #include "strutil.h"
 #include "dbutils.h"
 #include "errcode.h"
-#include "config.h"

-#define MIN_SUPPORTED_VERSION		"9.3"
-#define MIN_SUPPORTED_VERSION_NUM	90300
+#define PRIMARY_MODE		0
+#define STANDBY_MODE		1

 #include "config.h"
 #define MAXFILENAME		1024
-#define ERRBUFF_SIZE	512
+#define ERRBUFF_SIZE		512

+#define DEFAULT_CONFIG_FILE		"./repmgr.conf"
 #define DEFAULT_WAL_KEEP_SEGMENTS	"5000"
 #define DEFAULT_DEST_DIR		"."
+#define DEFAULT_MASTER_PORT		"5432"
+#define DEFAULT_DBNAME			"postgres"
 #define DEFAULT_REPMGR_SCHEMA_PREFIX	"repmgr_"
-#define DEFAULT_PRIORITY		100
-#define FAILOVER_NODES_MAX_CHECK 50
-
-#define MANUAL_FAILOVER		0
-#define AUTOMATIC_FAILOVER	1
-#define NODE_NOT_FOUND      -1
-#define NO_UPSTREAM_NODE	-1
-#define UNKNOWN_NODE_ID     -1
-
-

 /* Run time options type */
 typedef struct
 {

-	char		dbname[MAXLEN];
-	char		host[MAXLEN];
-	char		username[MAXLEN];
-	char		dest_dir[MAXFILENAME];
-	char		config_file[MAXFILENAME];
-	char		remote_user[MAXLEN];
-	char		superuser[MAXLEN];
-	char		wal_keep_segments[MAXLEN];
-	bool		verbose;
-	bool		terse;
-	bool		force;
-	bool		wait_for_master;
-	bool		ignore_rsync_warn;
-	bool		witness_pwprompt;
-	bool		rsync_only;
-	bool		fast_checkpoint;
-	bool		ignore_external_config_files;
-	char		pg_ctl_mode[MAXLEN];
-	char		masterport[MAXLEN];
-	/*
-	 * configuration file parameters which can be overridden on the
-	 * command line
-	 */
-	char		loglevel[MAXLEN];
+	char dbname[MAXLEN];
+	char host[MAXLEN];
+	char username[MAXLEN];
+	char dest_dir[MAXFILENAME];
+	char config_file[MAXFILENAME];
+	char remote_user[MAXLEN];
+	char wal_keep_segments[MAXLEN];
+	bool verbose;
+	bool force;
+	bool ignore_rsync_warn;
+
+	char masterport[MAXLEN];

-	/* parameter used by STANDBY SWITCHOVER */
-	char		remote_config_file[MAXLEN];
-	char		pg_rewind[MAXFILENAME];
-	/* parameter used by STANDBY {ARCHIVE_CONFIG | RESTORE_CONFIG} */
-	char		config_archive_dir[MAXLEN];
 	/* parameter used by CLUSTER CLEANUP */
-	int			keep_history;
-
-	char		pg_bindir[MAXLEN];
-
-	char		recovery_min_apply_delay[MAXLEN];
-
-	/* deprecated command line options */
-	char		localport[MAXLEN];
-	bool		initdb_no_pwprompt;
-}	t_runtime_options;
-
-#define T_RUNTIME_OPTIONS_INITIALIZER { "", "", "", "", "", "", "", DEFAULT_WAL_KEEP_SEGMENTS, false, false, false, false, false, false, false, false, false, "smart", "", "", "", "", "", 0, "", "", "", false }
-
-extern char		repmgr_schema[MAXLEN];
-extern bool		config_file_found;
+	int	keep_history;
+} t_runtime_options;

 #endif
--- a/repmgr.sql
+++ b/repmgr.sql
@@ -1,7 +1,7 @@
 /*
 * repmgr.sql
 *
- * Copyright (C) 2ndQuadrant, 2010-2016
+ * Copyright (C) 2ndQuadrant, 2011
 *
 */

@@ -14,11 +14,8 @@ CREATE SCHEMA repmgr;
 */
 CREATE TABLE repl_nodes (
  id            integer primary key,
-  cluster   	text    not null,       -- Name to identify the cluster
-  name			text	not null,
-  conninfo      text    not null,
-  priority  	integer not null,
-  witness   	boolean not null default false
+  cluster   text        not null,       -- Name to identify the cluster
+  conninfo      text    not null
 );
 ALTER TABLE repl_nodes OWNER TO repmgr;

@@ -31,12 +28,13 @@ CREATE TABLE repl_monitor (
  standby_node                   INTEGER NOT NULL,
  last_monitor_time                      TIMESTAMP WITH TIME ZONE NOT NULL,
  last_wal_primary_location      TEXT NOT NULL,
-  last_wal_standby_location      TEXT,		-- In case of a witness server this will be NULL
+  last_wal_standby_location      TEXT NOT NULL,
  replication_lag                BIGINT NOT NULL,
  apply_lag                      BIGINT NOT NULL
 );
 ALTER TABLE repl_monitor OWNER TO repmgr;

+
 /*
 * This view shows the latest monitor info about every node.
 * Interesting thing to see:
@@ -48,23 +46,14 @@ ALTER TABLE repl_monitor OWNER TO repmgr;
 * time_lag: how many seconds are we from being up-to-date with master
 */
 CREATE VIEW repl_status AS
-SELECT primary_node, standby_node, name AS standby_name, last_monitor_time, last_wal_primary_location,
+WITH monitor_info AS (SELECT *, ROW_NUMBER() OVER (PARTITION BY primary_node, standby_node
+                                                       ORDER BY last_monitor_time desc)
+                        FROM repl_monitor)
+SELECT primary_node, standby_node, last_monitor_time, last_wal_primary_location,
       last_wal_standby_location, pg_size_pretty(replication_lag) replication_lag,
       pg_size_pretty(apply_lag) apply_lag,
       age(now(), last_monitor_time) AS time_lag
- FROM repl_monitor JOIN repl_nodes ON standby_node = id
-WHERE (standby_node, last_monitor_time) IN (SELECT standby_node, MAX(last_monitor_time)
-                                              FROM repl_monitor GROUP BY 1);
+  FROM monitor_info a
+ WHERE row_number = 1;

 ALTER VIEW repl_status OWNER TO repmgr;
-
-CREATE INDEX idx_repl_status_sort ON repl_monitor(last_monitor_time, standby_node);
-
-/*
- * This view shows the list of nodes with the information of which one is the upstream
- * in each case (when appliable)
- */
-CREATE VIEW repl_show_nodes AS 
-SELECT rn.id, rn.conninfo, rn.type, rn.name, rn.cluster,
-	rn.priority, rn.active, sq.name AS upstream_node_name
-FROM repl_nodes as rn LEFT JOIN repl_nodes AS sq ON sq.id=rn.upstream_node_id;
--- a/repmgrd.c
+++ b/repmgrd.c
--- a/sql/Makefile
+++ b/sql/Makefile
@@ -1,21 +0,0 @@
-#
-# Makefile
-#
-# Copyright (c) 2ndQuadrant, 2010-2016
-#
-
-MODULE_big = repmgr_funcs
-DATA_built=repmgr_funcs.sql
-DATA=uninstall_repmgr_funcs.sql
-OBJS=repmgr_funcs.o
-
-ifdef USE_PGXS
-PG_CONFIG = pg_config
-PGXS := $(shell $(PG_CONFIG) --pgxs)
-include $(PGXS)
-else
-subdir = contrib/repmgr/sql
-top_builddir = ../../..
-include $(top_builddir)/src/Makefile.global
-include $(top_srcdir)/contrib/contrib-global.mk
-endif
--- a/sql/repmgr2_repmgr3.sql
+++ b/sql/repmgr2_repmgr3.sql
@@ -1,76 +0,0 @@
-/*
- * Update a repmgr 2.x installation to repmgr 3.0
- * ----------------------------------------------
- *
- * 1. Stop any running repmgrd instances
- * 2. On the master node, execute the SQL statements listed below,
- *    taking care to identify the master node and any inactive
- *    nodes
- * 3. Restart repmgrd (being sure to use repmgr 3.0)
- */
-
-/*
- * Set the search path to the name of the schema used by
- * your repmgr installation
- * (this should be "repmgr_" + the cluster name defined in
- * 'repmgr.conf')
- */
-
-- SET search_path TO 'name_of_repmgr_schema';
-
-BEGIN;
-
-ALTER TABLE repl_nodes RENAME TO repl_nodes2_0;
-
-CREATE TABLE repl_nodes (
-  id               INTEGER PRIMARY KEY,
-  type             TEXT    NOT NULL CHECK (type IN('master','standby','witness')),
-  upstream_node_id INTEGER NULL REFERENCES repl_nodes (id),
-  cluster          TEXT    NOT NULL,
-  name             TEXT    NOT NULL,
-  conninfo         TEXT    NOT NULL,
-  slot_name        TEXT    NULL,
-  priority         INTEGER NOT NULL,
-  active           BOOLEAN NOT NULL DEFAULT TRUE
-);
-
-INSERT INTO repl_nodes
-           (id, type, cluster, name, conninfo, priority)
-     SELECT id,
-            CASE
-               WHEN witness IS TRUE THEN 'witness'
-               ELSE 'standby'
-            END AS type,
-            cluster,
-            name,
-            conninfo,
-            priority + 100
-       FROM repl_nodes2_0;
-
-/*
- * You'll need to set the master explicitly; the following query
- * should identify the master node ID but will only work if all
- * standby servers are connected:
- *
- * SELECT id FROM repmgr_test.repl_nodes WHERE name NOT IN (SELECT application_name FROM pg_stat_replication)
- *
- * If in doubt, execute 'repmgr cluster show' will definitively identify
- * the master.
- */
-UPDATE repl_nodes SET type = 'master' WHERE id = $master_id;
-
-/* If any nodes are known to be inactive, update them here */
-
-- UPDATE repl_nodes SET active = FALSE WHERE id IN (...);
-
-/* When you're sure of your changes, commit them */
-
-- COMMIT;
-
-
-/*
- * execute the following command when you are sure you no longer
- * require the old table:
- */
-
-- DROP TABLE repl_nodes2_0;
--- a/sql/repmgr3.0_repmgr3.1.sql
+++ b/sql/repmgr3.0_repmgr3.1.sql
@@ -1,35 +0,0 @@
-/*
- * Update a repmgr 3.0 installation to repmgr 3.1
- * ----------------------------------------------
- *
- * The new repmgr package should be installed first. Then
- * carry out these steps:
- *
- *   1. (If repmgrd is used) stop any running repmgrd instances
- *   2. On the master node, execute the SQL statements listed below
- *   3. (If repmgrd is used) restart repmgrd
- */
-
-/*
- * If your repmgr installation is not included in your repmgr
- * user's search path, please set the search path to the name
- * of the repmgr schema to ensure objects are installed in
- * the correct location.
- *
- * The repmgr schema is  "repmgr_" + the cluster name defined in
- * 'repmgr.conf'.
- */
-
-- SET search_path TO 'name_of_repmgr_schema';
-
-BEGIN;
-
-- New view "repl_show_nodes" which also displays the server's
-- upstream node
-
-CREATE VIEW repl_show_nodes AS
-SELECT rn.id, rn.conninfo, rn.type, rn.name, rn.cluster,
-	rn.priority, rn.active, sq.name AS upstream_node_name
-FROM repl_nodes as rn LEFT JOIN repl_nodes AS sq ON sq.id=rn.upstream_node_id;
-
-COMMIT;
--- a/sql/repmgr_funcs.c
+++ b/sql/repmgr_funcs.c
@@ -1,236 +0,0 @@
-/*
- * repmgr_funcs.c
- * Copyright (c) 2ndQuadrant, 2010
- *
- * Shared memory state management and some backend functions in SQL
- */
-
-#include "postgres.h"
-#include "fmgr.h"
-#include "access/xlog.h"
-#include "miscadmin.h"
-#include "replication/walreceiver.h"
-#include "storage/ipc.h"
-#include "storage/lwlock.h"
-#include "storage/procarray.h"
-#include "storage/shmem.h"
-#include "storage/spin.h"
-#include "utils/builtins.h"
-#include "utils/timestamp.h"
-
-/* same definition as the one in xlog_internal.h */
-#define MAXFNAMELEN		64
-
-PG_MODULE_MAGIC;
-
-/*
- * Global shared state
- */
-typedef struct repmgrSharedState
-{
-	LWLockId	lock;			/* protects search/modification */
-	char		location[MAXFNAMELEN];	/* last known xlog location */
-	TimestampTz last_updated;
-}	repmgrSharedState;
-
-/* Links to shared memory state */
-static repmgrSharedState *shared_state = NULL;
-
-static shmem_startup_hook_type prev_shmem_startup_hook = NULL;
-
-void		_PG_init(void);
-void		_PG_fini(void);
-
-static void repmgr_shmem_startup(void);
-static Size repmgr_memsize(void);
-
-static bool repmgr_set_standby_location(char *locationstr);
-
-Datum		repmgr_update_standby_location(PG_FUNCTION_ARGS);
-Datum		repmgr_get_last_standby_location(PG_FUNCTION_ARGS);
-
-PG_FUNCTION_INFO_V1(repmgr_update_standby_location);
-PG_FUNCTION_INFO_V1(repmgr_get_last_standby_location);
-
-Datum		repmgr_update_last_updated(PG_FUNCTION_ARGS);
-Datum		repmgr_get_last_updated(PG_FUNCTION_ARGS);
-
-PG_FUNCTION_INFO_V1(repmgr_update_last_updated);
-PG_FUNCTION_INFO_V1(repmgr_get_last_updated);
-
-
-
-/*
- * Module load callback
- */
-void
-_PG_init(void)
-{
-	/*
-	 * In order to create our shared memory area, we have to be loaded via
-	 * shared_preload_libraries.  If not, fall out without hooking into any of
-	 * the main system.  (We don't throw error here because it seems useful to
-	 * allow the repmgr functions to be created even when the module isn't
-	 * active.	The functions must protect themselves against being called
-	 * then, however.)
-	 */
-	if (!process_shared_preload_libraries_in_progress)
-		return;
-
-	/*
-	 * Request additional shared resources.  (These are no-ops if we're not in
-	 * the postmaster process.)  We'll allocate or attach to the shared
-	 * resources in repmgr_shmem_startup().
-	 */
-	RequestAddinShmemSpace(repmgr_memsize());
-	RequestAddinLWLocks(1);
-
-	/*
-	 * Install hooks.
-	 */
-	prev_shmem_startup_hook = shmem_startup_hook;
-	shmem_startup_hook = repmgr_shmem_startup;
-}
-
-/*
- * Module unload callback
- */
-void
-_PG_fini(void)
-{
-	/* Uninstall hooks. */
-	shmem_startup_hook = prev_shmem_startup_hook;
-}
-
-/*
- * shmem_startup hook: allocate or attach to shared memory,
- */
-static void
-repmgr_shmem_startup(void)
-{
-	bool		found;
-
-	if (prev_shmem_startup_hook)
-		prev_shmem_startup_hook();
-
-	/* reset in case this is a restart within the postmaster */
-	shared_state = NULL;
-
-	/*
-	 * Create or attach to the shared memory state, including hash table
-	 */
-	LWLockAcquire(AddinShmemInitLock, LW_EXCLUSIVE);
-
-	shared_state = ShmemInitStruct("repmgr shared state",
-								   sizeof(repmgrSharedState),
-								   &found);
-
-	if (!found)
-	{
-		/* First time through ... */
-		shared_state->lock = LWLockAssign();
-		snprintf(shared_state->location,
-				 sizeof(shared_state->location), "%X/%X", 0, 0);
-	}
-
-	LWLockRelease(AddinShmemInitLock);
-}
-
-
-/*
- * Estimate shared memory space needed.
- */
-static Size
-repmgr_memsize(void)
-{
-	return MAXALIGN(sizeof(repmgrSharedState));
-}
-
-
-static bool
-repmgr_set_standby_location(char *locationstr)
-{
-	/* Safety check... */
-	if (!shared_state)
-		return false;
-
-	LWLockAcquire(shared_state->lock, LW_EXCLUSIVE);
-	strncpy(shared_state->location, locationstr, MAXFNAMELEN);
-	LWLockRelease(shared_state->lock);
-
-	return true;
-}
-
-
-/* SQL Functions */
-
-/* Read last xlog location reported by this standby from shared memory */
-Datum
-repmgr_get_last_standby_location(PG_FUNCTION_ARGS)
-{
-	char		location[MAXFNAMELEN];
-
-	/* Safety check... */
-	if (!shared_state)
-		PG_RETURN_NULL();
-
-	LWLockAcquire(shared_state->lock, LW_SHARED);
-	strncpy(location, shared_state->location, MAXFNAMELEN);
-	LWLockRelease(shared_state->lock);
-
-	PG_RETURN_TEXT_P(cstring_to_text(location));
-}
-
-
-/* Set update last xlog location reported by this standby to shared memory */
-Datum
-repmgr_update_standby_location(PG_FUNCTION_ARGS)
-{
-	text	   *location = PG_GETARG_TEXT_P(0);
-	char	   *locationstr;
-
-	/* Safety check... */
-	if (!shared_state)
-		PG_RETURN_BOOL(false);
-
-	locationstr = text_to_cstring(location);
-
-	PG_RETURN_BOOL(repmgr_set_standby_location(locationstr));
-}
-
-/* update and return last updated with current timestamp */
-Datum
-repmgr_update_last_updated(PG_FUNCTION_ARGS)
-{
-	TimestampTz last_updated = GetCurrentTimestamp();
-
-	/* Safety check... */
-	if (!shared_state)
-		PG_RETURN_NULL();
-
-	LWLockAcquire(shared_state->lock, LW_SHARED);
-	shared_state->last_updated = last_updated;
-	LWLockRelease(shared_state->lock);
-
-	PG_RETURN_TIMESTAMPTZ(last_updated);
-}
-
-
-/* get last updated timestamp */
-Datum
-repmgr_get_last_updated(PG_FUNCTION_ARGS)
-{
-	TimestampTz last_updated;
-
-	/* Safety check... */
-	if (!shared_state)
-		PG_RETURN_NULL();
-
-	LWLockAcquire(shared_state->lock, LW_EXCLUSIVE);
-	last_updated = shared_state->last_updated;
-	LWLockRelease(shared_state->lock);
-
-	PG_RETURN_TIMESTAMPTZ(last_updated);
-}
-
-
--- a/sql/repmgr_funcs.sql.in
+++ b/sql/repmgr_funcs.sql.in
@@ -1,23 +0,0 @@
-/*
- * repmgr_function.sql
- * Copyright (c) 2ndQuadrant, 2010-2016
- *
- */
-
-- SET SEARCH_PATH TO 'repmgr';
-
-CREATE FUNCTION repmgr_update_standby_location(text) RETURNS boolean
-AS 'MODULE_PATHNAME', 'repmgr_update_standby_location'
-LANGUAGE C STRICT;
-
-CREATE FUNCTION repmgr_get_last_standby_location() RETURNS text
-AS 'MODULE_PATHNAME', 'repmgr_get_last_standby_location'
-LANGUAGE C STRICT;
-
-CREATE FUNCTION repmgr_update_last_updated() RETURNS TIMESTAMP WITH TIME ZONE
-AS 'MODULE_PATHNAME', 'repmgr_update_last_updated'
-LANGUAGE C STRICT;
-
-CREATE FUNCTION repmgr_get_last_updated() RETURNS TIMESTAMP WITH TIME ZONE
-AS 'MODULE_PATHNAME', 'repmgr_get_last_updated'
-LANGUAGE C STRICT;
--- a/sql/uninstall_repmgr_funcs.sql
+++ b/sql/uninstall_repmgr_funcs.sql
@@ -1,11 +0,0 @@
-/*
- * uninstall_repmgr_funcs.sql
- * Copyright (c) 2ndQuadrant, 2010-2016
- *
- */
-
-DROP FUNCTION repmgr_update_standby_location(text);
-DROP FUNCTION repmgr_get_last_standby_location();
-
-DROP FUNCTION repmgr_update_last_updated();
-DROP FUNCTION repmgr_get_last_updated();
--- a/strutil.c
+++ b/strutil.c
@@ -1,7 +1,7 @@
 /*
 * strutil.c
 *
- * Copyright (C) 2ndQuadrant, 2010-2016
+ * Copyright (C) 2ndQuadrant, 2011
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -25,21 +25,29 @@
 #include "log.h"
 #include "strutil.h"

-static int
-xvsnprintf(char *str, size_t size, const char *format, va_list ap)
-__attribute__((format(PG_PRINTF_ATTRIBUTE, 3, 0)));
+static int xvsnprintf(char *str, size_t size, const char *format, va_list ap);
+
+/* Add strnlen on platforms that don't have it, like OS X */
+#ifndef strnlen
+size_t
+strnlen(const char *s, size_t n)
+{
+	const char *end = (const char *) memchr(s, '\0', n);
+	return(end ? end - s : n);
+}
+#endif

 static int
 xvsnprintf(char *str, size_t size, const char *format, va_list ap)
 {
-	int			retval;
+	int retval;

 	retval = vsnprintf(str, size, format, ap);

-	if (retval >= (int) size)
+	if (retval >= size)
 	{
 		log_err(_("Buffer of size not large enough to format entire string '%s'\n"),
-				str);
+		        str);
 		exit(ERR_STR_OVERFLOW);
 	}

@@ -48,10 +56,10 @@ xvsnprintf(char *str, size_t size, const char *format, va_list ap)


 int
-xsnprintf(char *str, size_t size, const char *format,...)
+xsnprintf(char *str, size_t size, const char *format, ...)
 {
-	va_list		arglist;
-	int			retval;
+	va_list arglist;
+	int retval;

 	va_start(arglist, format);
 	retval = xvsnprintf(str, size, format, arglist);
@@ -62,7 +70,7 @@ xsnprintf(char *str, size_t size, const char *format,...)


 int
-sqlquery_snprintf(char *str, const char *format,...)
+sqlquery_snprintf(char *str, const char *format, ...)
 {
 	va_list		arglist;
 	int			retval;
@@ -75,8 +83,7 @@ sqlquery_snprintf(char *str, const char *format,...)
 }


-int
-maxlen_snprintf(char *str, const char *format,...)
+int maxlen_snprintf(char *str, const char *format, ...)
 {
 	va_list		arglist;
 	int			retval;
--- a/strutil.h
+++ b/strutil.h
@@ -1,6 +1,6 @@
 /*
 * strutil.h
- * Copyright (C) 2ndQuadrant, 2010-2016
+ * Copyright (C) 2ndQuadrant, 2010-2011
 *
 *
 * This program is free software: you can redistribute it and/or modify
@@ -22,7 +22,7 @@
 #define _STRUTIL_H_

 #include <stdlib.h>
-#include "errcode.h"
+#include <errcode.h>

 #define QUERY_STR_LEN	8192
 #define MAXLEN			1024
@@ -31,16 +31,13 @@
 #define MAXCONNINFO		1024


-extern int
-xsnprintf(char *str, size_t size, const char *format,...)
-__attribute__((format(PG_PRINTF_ATTRIBUTE, 3, 4)));
+extern int xsnprintf(char *str, size_t size, const char *format, ...);
+extern int sqlquery_snprintf(char *str, const char *format, ...);
+extern int maxlen_snprintf(char *str, const char *format, ...);

-extern int
-sqlquery_snprintf(char *str, const char *format,...)
-__attribute__((format(PG_PRINTF_ATTRIBUTE, 2, 3)));
+/* Add strnlen on platforms that don't have it, like OS X */
+#ifndef strnlen
+extern size_t strnlen(const char *s, size_t n);
+#endif

-extern int
-maxlen_snprintf(char *str, const char *format,...)
-__attribute__((format(PG_PRINTF_ATTRIBUTE, 2, 3)));
-
-#endif   /* _STRUTIL_H_ */
+#endif	/* _STRUTIL_H_ */
--- a/uninstall_repmgr.sql
+++ b/uninstall_repmgr.sql
@@ -1,7 +1,7 @@
 /*
 * uninstall_repmgr.sql
 *
- * Copyright (C) 2ndQuadrant, 2010-2016
+ * Copyright (C) 2ndQuadrant, 2010-2011
 *
 */

--- a/version.h
+++ b/version.h
@@ -1,6 +1,4 @@
 #ifndef _VERSION_H_
 #define _VERSION_H_
-
-#define REPMGR_VERSION "3.1.1"
-
+#define REPMGR_VERSION "1.2.0"
 #endif
Author	SHA1	Message	Date
Jaime Casanova	e479ef4bd1	Add "--checksum" in rsync when using "--force" If the user don't put that option in rsync_options using of "--force" could be unsafe. While the probability of failures because of this are low they aren't zero.	2015-02-10 20:44:34 -05:00
Jaime Casanova	6390a41953	Options -F -I -v doesn't accept arguments, which means that on getopt_long shouldn't be marked with the colon (:) character. This has been wrong since day one, so backpatching all the way until 1.1	2013-01-13 16:40:08 -05:00
Jaime Casanova	d7d91e1c12	Formatting using astyle	2012-12-11 11:54:35 -05:00
Jaime Casanova	d5ec394c54	Make repmgr compatible with FreeBSD. We need to add an #include and make it use a different path for the "true" binary. Maybe we need to make this changes for all BSD systems but having no evidence of that i prefer to make this only for systems with __FreeBSD__	2012-09-15 17:44:03 -05:00
Jaime Casanova	f6093386a8	When we have more command-line arguments than we should have we need to show that last value and we should use only optind for that instead of optind+1	2012-09-15 17:41:42 -05:00
Jaime Casanova	efd50f11ac	Fix HISTORY to show from newest to oldest	2012-07-27 11:30:35 -05:00
Jaime Casanova	45a39084ed	Prepare release notes for release	2012-07-21 11:56:00 -05:00
Jaime Casanova	94c73a016f	Add a release note that was missing	2012-07-05 09:36:42 -05:00
Jaime Casanova	be5cbe4ddd	Improve the version message to actually show the repmgr version not only postgresql's one	2012-06-25 22:53:16 -05:00
Jaime Casanova	30d35d5b4c	Names on history file are without surnames when they are well-known so, keep it that way	2012-06-13 00:48:34 -05:00
Jaime Casanova	fa889a11ac	Remove now finished TODO item about having a sanity check for ssh	2012-06-13 00:43:00 -05:00
Jaime Casanova	f4087d0a32	Add a \n in a message	2012-06-12 23:41:31 -05:00
Jaime Casanova	a55d7a4bd3	getMasterConnection() cannot avoid checking the same node that asks to find the master. This was a micro optimization based on the fact that all commands that needed to detect the master were executed from the standby but now that we have CLUSTER level commands that is not true anymore	2012-06-12 23:23:49 -05:00
Jaime Casanova	5d8cf6abe0	Allow repmgr to obtain tablespace's locations from pg 9.2 and later in which we no longer have a spclocation column in pg_tablespaces	2012-06-12 10:49:23 -05:00
Jaime Casanova	9caa243354	Moving the 'Starting backup' message to a better place	2012-06-12 09:44:06 -05:00
Jaime Casanova	6880483947	STANDBY CLONE should be run by a SUPERUSER, otherwise we won't be able to retrieve data_directory and the other parameters we need by querying the database.	2012-06-12 09:37:03 -05:00
Jaime Casanova	3d89fdadab	Fix a typo in a message	2012-06-12 09:28:27 -05:00
Cédric Villemain	6e9e4e05ae	Add test_ssh_connection The feature was written by Jaime and reworked by me to fix https://github.com/greg2ndQuadrant/repmgr/issues/5	2012-05-09 15:24:38 -05:00
Jaime Casanova	17a160e970	Correct credits	2012-05-09 14:59:00 -05:00
Jaime Casanova	e0e01aa9db	Add Carlo to CREDITS	2012-04-27 02:09:48 -05:00
Jaime Casanova	b09eff9f76	Avoid the possibility of a double free. Fix by Carlo Ascani	2012-04-27 02:08:40 -05:00
Jaime Casanova	3c5d82b9ef	Complete CREDITS and HISTORY for release	2012-04-27 02:07:42 -05:00
Jaime Casanova	257dbc4f42	Cleanup of patch that introduces write_primary_conninfo()	2012-04-27 01:23:37 -05:00
Jaime Casanova	2a64099163	Added function "write_primary_conninfo" which now adds the username to the primary_conninfo parameter in recovery.conf	2012-04-27 01:10:24 -05:00
Jaime Casanova	41c05bea7b	Fix CLUSTER SHOW, that i have broken	2012-04-26 13:58:39 -05:00
Jaime Casanova	7d76d86e19	Add debug information to CLUSTER SHOW y CLUSTER CLEANUP	2012-04-26 13:31:54 -05:00
Jaime Casanova	36d5b5bc24	I need a local connection to get the master of the cluster	2012-04-26 12:29:04 -05:00
Jaime Casanova	c543402d65	A typo that escaped to my previous review	2012-04-26 12:23:24 -05:00
Jaime Casanova	d0959b953e	Cleanup patch about CLUSTER CLEANUP	2012-04-26 12:21:41 -05:00
Jaime Casanova	0660bded0b	Fix a switch in which a "break" was missing that makes always that --force option was used end up in the default section and error.	2012-04-19 12:21:49 -05:00
Jaime Casanova	209a0c64d2	Add documentation about both CLUSTER SHOW and CLUSTER CLEANUP commands	2012-04-14 21:56:58 -05:00
Jaime Casanova	fd76ec6283	Adds a CLUSTER CLEANUP command to clean monitor's history, also include a --keep-history (-k) option to indicate how many days of history to keep	2012-04-14 21:34:06 -05:00
Jaime Casanova	7d579cf71f	Add CLUSTER SHOW command to show the current nodes configured	2012-04-14 21:11:51 -05:00
Jaime Casanova	d790ef740b	Add a paragraph in the docs describing how to clean history	2012-04-11 10:54:22 -05:00
Jaime Casanova	aa6633b027	Complete the lists of error codes that repmgr can return in the README.rst	2012-04-11 10:38:22 -05:00
Jaime Casanova	c3bffce379	Run astyle to format code before tagging the release	2012-04-11 10:35:37 -05:00
Jaime Casanova	78aea00a6d	Avoid to show what segments are needed for this backup if the rsync failed	2012-04-11 10:34:38 -05:00
Jaime Casanova	91601204b5	Remove last argument from log_err, left in commit `9b8fb7e960`. Also rephrase the sentence Reported by Jeroen Dekkers	2011-11-28 17:26:19 -05:00
Jaime Casanova	c91ddc2f5e	Fix a wrong message. It was saying the problem is the version of the PostgreSQL server while it actually is because the MASTER REGISTER command was running on a standby node	2011-11-10 09:30:42 -05:00
Jaime Casanova	72f74dd7a7	Fix a typo introduced in commit `94c9c3a5c6`	2011-11-03 12:54:55 -05:00
Jaime Casanova	901d07fa92	Improve performance of the repl_status view	2011-10-20 23:20:03 -05:00
Greg Smith	f0e609bcd4	Add strnlen on platforms that don't have it, such as OS X	2011-10-20 17:04:29 -05:00
Jaime Casanova	94c9c3a5c6	Let the clone happen in a session with synchronous_commit off. This is because in pg 9.1 the default configuration can easily allow sync rep to be activated even if no standby is present and will block pg_start_backup() and pg_stop_backup() in that case. Also remove a second connection we were opening to execute pg_stop_backup(), i'm not sure why that was there but now it was a problem because it was another session and not the one we set here.	2011-10-03 13:56:31 -05:00
Cédric Villemain	3af5243bcc	Fix rsync return code test	2011-08-24 09:14:22 -05:00
Cédric Villemain	85bbae462a	Add --ignore-rsync-warning to README	2011-08-22 00:34:01 -05:00
Cédric Villemain	14e49d41c2	Add --ignore-rsync-warning command line option This fix the rsync return code in case there are vanished files. Common situation are DROPed tables and TEMPorary object deletion and are handled by PostgreSQL. But as it may exist situation where an external process delete files in the PGDATA the flag is off by default. XXX 2 items : * is -I a good choice ? maybe we need to prevent future --ignore-foo and add something like : --ignore=rsync_warning -I rsync_warning * the warning message is not enough explicit with the risk involved by --force usage	2011-08-22 00:32:40 -05:00
Cédric Villemain	1bd8a703c8	Fix getopt for ignore-rsync-warning The change was loosed during merge and not checked in master/	2011-06-06 20:56:45 -04:00
				`@@ -1 +0,0 @@`
				`The contents of this file have been incorporated into the main README.md document.`